diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-17 16:20:30 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-17 16:20:30 -0500 |
| commit | b04a92e1601eb6df3a3b6599e7fb7ee021eef2cb (patch) | |
| tree | f190980d5bffae81a67c0cea0d913ed2444ceb0c /arch/i386/kernel/smpboot.c | |
| parent | 70c07e02625ec46d0ffbfce1acef42d660803528 (diff) | |
| parent | f5e2a7b22e7d7dfda8794906d0fddeaaa09bb944 (diff) | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'arch/i386/kernel/smpboot.c')
| -rw-r--r-- | arch/i386/kernel/smpboot.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/i386/kernel/smpboot.c b/arch/i386/kernel/smpboot.c index 255adb498268..fb00ab7b7612 100644 --- a/arch/i386/kernel/smpboot.c +++ b/arch/i386/kernel/smpboot.c | |||
| @@ -87,11 +87,7 @@ EXPORT_SYMBOL(cpu_online_map); | |||
| 87 | cpumask_t cpu_callin_map; | 87 | cpumask_t cpu_callin_map; |
| 88 | cpumask_t cpu_callout_map; | 88 | cpumask_t cpu_callout_map; |
| 89 | EXPORT_SYMBOL(cpu_callout_map); | 89 | EXPORT_SYMBOL(cpu_callout_map); |
| 90 | #ifdef CONFIG_HOTPLUG_CPU | ||
| 91 | cpumask_t cpu_possible_map = CPU_MASK_ALL; | ||
| 92 | #else | ||
| 93 | cpumask_t cpu_possible_map; | 90 | cpumask_t cpu_possible_map; |
| 94 | #endif | ||
| 95 | EXPORT_SYMBOL(cpu_possible_map); | 91 | EXPORT_SYMBOL(cpu_possible_map); |
| 96 | static cpumask_t smp_commenced_mask; | 92 | static cpumask_t smp_commenced_mask; |
| 97 | 93 | ||