diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-07-13 15:15:43 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-07-13 15:15:43 -0400 |
| commit | 99ad25a313bda566a346b46a6015afa65bc0a02b (patch) | |
| tree | b9443fed1ab74f320c4ee0791864ee96d7c069df /arch/sparc64/kernel/smp.c | |
| parent | f62c4a96f74d6c6dd56d1742697e94a5c2085e87 (diff) | |
| parent | 9a556e89081b0c1c2f83cee915363b15a68a6f2d (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'arch/sparc64/kernel/smp.c')
| -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 | ||