On 06/01/2012 02:10 AM, Srivatsa S. Bhat wrote:
The per-cpu variable cpu_state is used in x86 and also used in other architectures, to track the state of the cpu during bringup and hotplug. Pull it out into generic code. Cc: Tony Luck<tony.luck@xxxxxxxxx> Cc: Fenghua Yu<fenghua.yu@xxxxxxxxx> Cc: Ralf Baechle<ralf@xxxxxxxxxxxxxx> Cc: Benjamin Herrenschmidt<benh@xxxxxxxxxxxxxxxxxxx> Cc: Paul Mundt<lethal@xxxxxxxxxxxx> Cc: Chris Metcalf<cmetcalf@xxxxxxxxxx> Cc: Thomas Gleixner<tglx@xxxxxxxxxxxxx> Cc: Ingo Molnar<mingo@xxxxxxxxxx> Cc: "H. Peter Anvin"<hpa@xxxxxxxxx> Cc: x86@xxxxxxxxxx Cc: Konrad Rzeszutek Wilk<konrad.wilk@xxxxxxxxxx> Cc: Jeremy Fitzhardinge<jeremy@xxxxxxxx> Cc: Peter Zijlstra<a.p.zijlstra@xxxxxxxxx> Cc: Andrew Morton<akpm@xxxxxxxxxxxxxxxxxxxx> Cc: Mike Frysinger<vapier@xxxxxxxxxx> Cc: Yong Zhang<yong.zhang0@xxxxxxxxx> Cc: Venkatesh Pallipadi<venki@xxxxxxxxxx> Cc: Suresh Siddha<suresh.b.siddha@xxxxxxxxx> Cc: linux-ia64@xxxxxxxxxxxxxxx Cc: linux-mips@xxxxxxxxxxxxxx Cc: linuxppc-dev@xxxxxxxxxxxxxxxx Cc: linux-sh@xxxxxxxxxxxxxxx Cc: xen-devel@xxxxxxxxxxxxxxxxxxx Cc: virtualization@xxxxxxxxxxxxxxxxxxxxxxxxxx Signed-off-by: Srivatsa S. Bhat<srivatsa.bhat@xxxxxxxxxxxxxxxxxx> --- arch/ia64/include/asm/cpu.h | 2 -- arch/ia64/kernel/process.c | 1 + arch/ia64/kernel/smpboot.c | 6 +----- arch/mips/cavium-octeon/smp.c | 4 +--- arch/powerpc/kernel/smp.c | 6 +----- arch/sh/include/asm/smp.h | 2 -- arch/sh/kernel/smp.c | 4 +--- arch/tile/kernel/smpboot.c | 4 +--- arch/x86/include/asm/cpu.h | 2 -- arch/x86/kernel/smpboot.c | 4 +--- arch/x86/xen/smp.c | 1 + include/linux/smpboot.h | 1 + kernel/smpboot.c | 4 ++++ 13 files changed, 13 insertions(+), 28 deletions(-)
[...]
diff --git a/arch/mips/cavium-octeon/smp.c b/arch/mips/cavium-octeon/smp.c index 97e7ce9..93cd4b0 100644 --- a/arch/mips/cavium-octeon/smp.c +++ b/arch/mips/cavium-octeon/smp.c @@ -13,6 +13,7 @@ #include<linux/kernel_stat.h> #include<linux/sched.h> #include<linux/module.h> +#include<linux/smpboot.h> #include<asm/mmu_context.h> #include<asm/time.h> @@ -252,9 +253,6 @@ static void octeon_cpus_done(void) #ifdef CONFIG_HOTPLUG_CPU -/* State of each CPU. */ -DEFINE_PER_CPU(int, cpu_state); - extern void fixup_irqs(void); static DEFINE_SPINLOCK(smp_reserve_lock);
The Octeon bit: Acked-by: David Daney <david.daney@xxxxxxxxxx> FWIW, the rest looks good too.
