Patchwork move smp_hw_index to 32-bit code

login
register
mail settings
Submitter Nathan Lynch
Date Dec. 11, 2008, 12:28 a.m.
Message ID <1228955322-16995-1-git-send-email-ntl@pobox.com>
Download mbox | patch
Permalink /patch/13382/
State Accepted, archived
Commit 13a9801eb669d567ab2c8f8db5e50557fef5f636
Headers show

Comments

Nathan Lynch - Dec. 11, 2008, 12:28 a.m.
smp_hw_index isn't used on 64-bit, so move it from smp.c to
setup_32.c.

Signed-off-by: Nathan Lynch <ntl@pobox.com>
---
 arch/powerpc/kernel/setup_32.c |    2 ++
 arch/powerpc/kernel/smp.c      |    1 -
 2 files changed, 2 insertions(+), 1 deletions(-)

Patch

diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c
index c1a2762..2e9fcf0 100644
--- a/arch/powerpc/kernel/setup_32.c
+++ b/arch/powerpc/kernel/setup_32.c
@@ -49,6 +49,8 @@  int boot_cpuid;
 EXPORT_SYMBOL_GPL(boot_cpuid);
 int boot_cpuid_phys;
 
+int smp_hw_index[NR_CPUS];
+
 unsigned long ISA_DMA_THRESHOLD;
 unsigned int DMA_MODE_READ;
 unsigned int DMA_MODE_WRITE;
diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c
index ff9f701..5af6ac1 100644
--- a/arch/powerpc/kernel/smp.c
+++ b/arch/powerpc/kernel/smp.c
@@ -57,7 +57,6 @@ 
 #define DBG(fmt...)
 #endif
 
-int smp_hw_index[NR_CPUS];
 struct thread_info *secondary_ti;
 
 cpumask_t cpu_possible_map = CPU_MASK_NONE;