diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-12 16:17:42 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-12 16:17:42 -0400 |
| commit | 9f02d6b7b43d46a74dd385f06090104ecd0fb807 (patch) | |
| tree | 34ad1618e7f10ed7310953de8b11fe39494cd942 | |
| parent | 9ffc7a0ebfcace0ed3eb77fb77e159f6f9443ec5 (diff) | |
| parent | c12a828982ee27e0d9f742177016896d6c3a5acb (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
| -rw-r--r-- | arch/sparc64/kernel/smp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc64/kernel/smp.c b/arch/sparc64/kernel/smp.c index 441fc2e52ce6..7e8e2919e186 100644 --- a/arch/sparc64/kernel/smp.c +++ b/arch/sparc64/kernel/smp.c | |||
| @@ -45,8 +45,8 @@ extern void calibrate_delay(void); | |||
| 45 | /* Please don't make this stuff initdata!!! --DaveM */ | 45 | /* Please don't make this stuff initdata!!! --DaveM */ |
| 46 | static unsigned char boot_cpu_id; | 46 | static unsigned char boot_cpu_id; |
| 47 | 47 | ||
| 48 | cpumask_t cpu_online_map = CPU_MASK_NONE __read_mostly; | 48 | cpumask_t cpu_online_map __read_mostly = CPU_MASK_NONE; |
| 49 | cpumask_t phys_cpu_present_map = CPU_MASK_NONE __read_mostly; | 49 | cpumask_t phys_cpu_present_map __read_mostly = CPU_MASK_NONE; |
| 50 | static cpumask_t smp_commenced_mask; | 50 | static cpumask_t smp_commenced_mask; |
| 51 | static cpumask_t cpu_callout_map; | 51 | static cpumask_t cpu_callout_map; |
| 52 | 52 | ||