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.l...@intel.com>
Cc: Fenghua Yu<fenghua...@intel.com>
Cc: Ralf Baechle<r...@linux-mips.org>
Cc: Benjamin Herrenschmidt<b...@kernel.crashing.org>
Cc: Paul Mundt<let...@linux-sh.org>
Cc: Chris Metcalf<cmetc...@tilera.com>
Cc: Thomas Gleixner<t...@linutronix.de>
Cc: Ingo Molnar<mi...@redhat.com>
Cc: "H. Peter Anvin"<h...@zytor.com>
Cc: x...@kernel.org
Cc: Konrad Rzeszutek Wilk<konrad.w...@oracle.com>
Cc: Jeremy Fitzhardinge<jer...@goop.org>
Cc: Peter Zijlstra<a.p.zijls...@chello.nl>
Cc: Andrew Morton<a...@linux-foundation.org>
Cc: Mike Frysinger<vap...@gentoo.org>
Cc: Yong Zhang<yong.zha...@gmail.com>
Cc: Venkatesh Pallipadi<ve...@google.com>
Cc: Suresh Siddha<suresh.b.sid...@intel.com>
Cc: linux-i...@vger.kernel.org
Cc: linux-m...@linux-mips.org
Cc: linuxppc-dev@lists.ozlabs.org
Cc: linux...@vger.kernel.org
Cc: xen-de...@lists.xensource.com
Cc: virtualizat...@lists.linux-foundation.org
Signed-off-by: Srivatsa S. Bhat<srivatsa.b...@linux.vnet.ibm.com>
---
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.da...@cavium.com>
FWIW, the rest looks good too.
_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev
