diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-16 10:58:48 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-16 10:58:48 -0500 |
commit | d58a75ef75ad98f2d20ee6dccfc71f881aabffb0 (patch) | |
tree | fbfa28526e3e2695c61d83a1a4997a8c3d00b686 /arch/powerpc/kernel/smp.c | |
parent | f6ff56cd56b83d8edf4b3cffc5c53c56b37a5081 (diff) | |
parent | 5d66da3d71e6aeca80ca08dbebd8a1cd72e6ee1f (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
Diffstat (limited to 'arch/powerpc/kernel/smp.c')
-rw-r--r-- | arch/powerpc/kernel/smp.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c index 62dfc5b8d765..30374d2f88e5 100644 --- a/arch/powerpc/kernel/smp.c +++ b/arch/powerpc/kernel/smp.c | |||
@@ -49,15 +49,16 @@ | |||
49 | #include <asm/paca.h> | 49 | #include <asm/paca.h> |
50 | #endif | 50 | #endif |
51 | 51 | ||
52 | int smp_hw_index[NR_CPUS]; | ||
53 | struct thread_info *secondary_ti; | ||
54 | |||
55 | #ifdef DEBUG | 52 | #ifdef DEBUG |
53 | #include <asm/udbg.h> | ||
56 | #define DBG(fmt...) udbg_printf(fmt) | 54 | #define DBG(fmt...) udbg_printf(fmt) |
57 | #else | 55 | #else |
58 | #define DBG(fmt...) | 56 | #define DBG(fmt...) |
59 | #endif | 57 | #endif |
60 | 58 | ||
59 | int smp_hw_index[NR_CPUS]; | ||
60 | struct thread_info *secondary_ti; | ||
61 | |||
61 | cpumask_t cpu_possible_map = CPU_MASK_NONE; | 62 | cpumask_t cpu_possible_map = CPU_MASK_NONE; |
62 | cpumask_t cpu_online_map = CPU_MASK_NONE; | 63 | cpumask_t cpu_online_map = CPU_MASK_NONE; |
63 | cpumask_t cpu_sibling_map[NR_CPUS] = { [0 ... NR_CPUS-1] = CPU_MASK_NONE }; | 64 | cpumask_t cpu_sibling_map[NR_CPUS] = { [0 ... NR_CPUS-1] = CPU_MASK_NONE }; |