diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-12 22:17:42 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-12 22:17:42 +0200 |
| commit | 9f02d6b7b43d46a74dd385f06090104ecd0fb807 (patch) | |
| tree | 34ad1618e7f10ed7310953de8b11fe39494cd942 | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| parent | [SPARC64]: Fix SMP build failure. (diff) | |
| download | linux-9f02d6b7b43d46a74dd385f06090104ecd0fb807.tar.xz linux-9f02d6b7b43d46a74dd385f06090104ecd0fb807.zip | |
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); /* Please don't make this stuff initdata!!! --DaveM */ static unsigned char boot_cpu_id; -cpumask_t cpu_online_map = CPU_MASK_NONE __read_mostly; -cpumask_t phys_cpu_present_map = CPU_MASK_NONE __read_mostly; +cpumask_t cpu_online_map __read_mostly = CPU_MASK_NONE; +cpumask_t phys_cpu_present_map __read_mostly = CPU_MASK_NONE; static cpumask_t smp_commenced_mask; static cpumask_t cpu_callout_map; |