Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

9f02d6b7 · Linus Torvalds · 9ffc7a0e · c12a8289 · 9f02d6b7
Commit 9f02d6b7 authored Jul 12, 2005 by Linus Torvalds
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

arch/sparc64/kernel/smp.c arch/sparc64/kernel/smp.c +2 -2

No files found.
--- 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;