diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-30 17:56:57 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-30 17:56:57 +0200 |
| commit | bbad5d4750ab3b44a196f9bdd982972e41b7e520 (patch) | |
| tree | 357c30909ea7311daacc7e5e9e79c6d91a857d00 /arch/x86/kernel/smpboot.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb (diff) | |
| parent | ptrace GET/SET FPXREGS broken (diff) | |
| download | linux-bbad5d4750ab3b44a196f9bdd982972e41b7e520.tar.xz linux-bbad5d4750ab3b44a196f9bdd982972e41b7e520.zip | |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
ptrace GET/SET FPXREGS broken
x86: fix cpu hotplug crash
x86: section/warning fixes
x86: shift bits the right way in native_read_tscp
Diffstat (limited to 'arch/x86/kernel/smpboot.c')
| -rw-r--r-- | arch/x86/kernel/smpboot.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index 56078d61c793..3e1cecedde42 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -996,7 +996,6 @@ do_rest: #endif cpu_clear(cpu, cpu_callout_map); /* was set by do_boot_cpu() */ cpu_clear(cpu, cpu_initialized); /* was set by cpu_init() */ - cpu_clear(cpu, cpu_possible_map); cpu_clear(cpu, cpu_present_map); per_cpu(x86_cpu_to_apicid, cpu) = BAD_APICID; } |