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@intel.com>
Cc: Fenghua Yu<redacted>
Cc: Ralf Baechle<redacted>
Cc: Benjamin Herrenschmidt<benh@kernel.crashing.org>
Cc: Paul Mundt<redacted>
Cc: Chris Metcalf<redacted>
Cc: Thomas Gleixner<redacted>
Cc: Ingo Molnar<mingo@redhat.com>
Cc: "H. Peter Anvin"<hpa@zytor.com>
Cc: x86@kernel.org
Cc: Konrad Rzeszutek Wilk<redacted>
Cc: Jeremy Fitzhardinge<redacted>
Cc: Peter Zijlstra<redacted>
Cc: Andrew Morton<akpm@linux-foundation.org>
Cc: Mike Frysinger<redacted>
Cc: Yong Zhang<redacted>
Cc: Venkatesh Pallipadi<redacted>
Cc: Suresh Siddha<redacted>
Cc: <redacted>
Cc: <redacted>
Cc: <redacted>
Cc: <redacted>
Cc: <redacted>
Cc: <redacted>
Signed-off-by: Srivatsa S. Bhat<redacted>
---
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(-)
[...]
quoted hunk ↗ jump to hunk
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 <redacted>
FWIW, the rest looks good too.