diff options
author | Nathan Lynch <ntl@pobox.com> | 2008-12-10 09:28:41 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-12-15 23:53:05 -0500 |
commit | 13a9801eb669d567ab2c8f8db5e50557fef5f636 (patch) | |
tree | 068889192a31708cb09805aca282e39635bddda9 /arch/powerpc/kernel | |
parent | 6b82b3e4b54b2fce2ca11976c535012b836b2016 (diff) |
powerpc: Move smp_hw_index to 32-bit code
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>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel')
-rw-r--r-- | arch/powerpc/kernel/setup_32.c | 2 | ||||
-rw-r--r-- | arch/powerpc/kernel/smp.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c index cc4679ed9527..086c23c1ee5e 100644 --- a/arch/powerpc/kernel/setup_32.c +++ b/arch/powerpc/kernel/setup_32.c | |||
@@ -49,6 +49,8 @@ int boot_cpuid; | |||
49 | EXPORT_SYMBOL_GPL(boot_cpuid); | 49 | EXPORT_SYMBOL_GPL(boot_cpuid); |
50 | int boot_cpuid_phys; | 50 | int boot_cpuid_phys; |
51 | 51 | ||
52 | int smp_hw_index[NR_CPUS]; | ||
53 | |||
52 | unsigned long ISA_DMA_THRESHOLD; | 54 | unsigned long ISA_DMA_THRESHOLD; |
53 | unsigned int DMA_MODE_READ; | 55 | unsigned int DMA_MODE_READ; |
54 | unsigned int DMA_MODE_WRITE; | 56 | unsigned int DMA_MODE_WRITE; |
diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c index a59d8d72bb97..ffcb1779a220 100644 --- a/arch/powerpc/kernel/smp.c +++ b/arch/powerpc/kernel/smp.c | |||
@@ -57,7 +57,6 @@ | |||
57 | #define DBG(fmt...) | 57 | #define DBG(fmt...) |
58 | #endif | 58 | #endif |
59 | 59 | ||
60 | int smp_hw_index[NR_CPUS]; | ||
61 | struct thread_info *secondary_ti; | 60 | struct thread_info *secondary_ti; |
62 | 61 | ||
63 | cpumask_t cpu_possible_map = CPU_MASK_NONE; | 62 | cpumask_t cpu_possible_map = CPU_MASK_NONE; |