| From 53f0cf8e1944da224a6d07f6c91b40af98ce142f Mon Sep 17 00:00:00 2001 |
| From: Magnus Damm <damm@opensource.se> |
| Date: Thu, 8 Aug 2013 07:13:49 +0900 |
| Subject: ARM: shmobile: Remove unused shmobile_smp_init_cpus() |
| |
| Remove shmobile_smp_init_cpus() since all SMP platforms in |
| mach-shmobile now rely on DT for CPU core description instead |
| of for instance determining number of cores from the SCU. |
| |
| Signed-off-by: Magnus Damm <damm@opensource.se> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit c4e1e64d2b6a921a57629ede635f81f5d2882543) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/mach-shmobile/include/mach/common.h | 1 - |
| arch/arm/mach-shmobile/platsmp.c | 15 --------------- |
| 2 files changed, 16 deletions(-) |
| |
| diff --git a/arch/arm/mach-shmobile/include/mach/common.h b/arch/arm/mach-shmobile/include/mach/common.h |
| index 1ed155eb3e92..26eaff1429bf 100644 |
| --- a/arch/arm/mach-shmobile/include/mach/common.h |
| +++ b/arch/arm/mach-shmobile/include/mach/common.h |
| @@ -40,7 +40,6 @@ static inline int shmobile_cpuidle_init(void) { return 0; } |
| #endif |
| |
| extern void __iomem *shmobile_scu_base; |
| -extern void shmobile_smp_init_cpus(unsigned int ncores); |
| |
| static inline void __init shmobile_init_late(void) |
| { |
| diff --git a/arch/arm/mach-shmobile/platsmp.c b/arch/arm/mach-shmobile/platsmp.c |
| index 3741562156ed..9ebc246b8d7d 100644 |
| --- a/arch/arm/mach-shmobile/platsmp.c |
| +++ b/arch/arm/mach-shmobile/platsmp.c |
| @@ -11,25 +11,10 @@ |
| * published by the Free Software Foundation. |
| */ |
| #include <linux/init.h> |
| -#include <linux/smp.h> |
| #include <asm/cacheflush.h> |
| #include <asm/smp_plat.h> |
| #include <mach/common.h> |
| |
| -void __init shmobile_smp_init_cpus(unsigned int ncores) |
| -{ |
| - unsigned int i; |
| - |
| - if (ncores > nr_cpu_ids) { |
| - pr_warn("SMP: %u cores greater than maximum (%u), clipping\n", |
| - ncores, nr_cpu_ids); |
| - ncores = nr_cpu_ids; |
| - } |
| - |
| - for (i = 0; i < ncores; i++) |
| - set_cpu_possible(i, true); |
| -} |
| - |
| extern unsigned long shmobile_smp_fn[]; |
| extern unsigned long shmobile_smp_arg[]; |
| extern unsigned long shmobile_smp_mpidr[]; |
| -- |
| 1.8.5.rc3 |
| |
