diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-08 04:14:40 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-08 03:13:15 -0400 |
| commit | 6fe9fe875691e15eda61b992e03257e68aa5ba4f (patch) | |
| tree | 32c35b6937f40cb66b542b64364d670f22842308 /arch/x86/kernel | |
| parent | ab5a5be099cb20a1c006bf0e211c48502d7ebc44 (diff) | |
Revert "x86: APIC/SMP: downgrade the NMI watchdog for "nosmp""
This reverts commit 791b93d3dfaf16c23e978bec0cc0a3dd9d855d63.
A better fix from Maciej will be merged.
Diffstat (limited to 'arch/x86/kernel')
| -rw-r--r-- | arch/x86/kernel/smpboot.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index df60bc7c9cb7..8c53d86e3e86 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c | |||
| @@ -1159,10 +1159,6 @@ static int __init smp_sanity_check(unsigned max_cpus) | |||
| 1159 | if (!max_cpus) { | 1159 | if (!max_cpus) { |
| 1160 | printk(KERN_INFO "SMP mode deactivated.\n"); | 1160 | printk(KERN_INFO "SMP mode deactivated.\n"); |
| 1161 | smpboot_clear_io_apic(); | 1161 | smpboot_clear_io_apic(); |
| 1162 | |||
| 1163 | if (nmi_watchdog != NMI_NONE && nmi_watchdog != NMI_DISABLED) | ||
| 1164 | nmi_watchdog = NMI_LOCAL_APIC; | ||
| 1165 | |||
| 1166 | #ifdef CONFIG_X86_32 | 1162 | #ifdef CONFIG_X86_32 |
| 1167 | connect_bsp_APIC(); | 1163 | connect_bsp_APIC(); |
| 1168 | #endif | 1164 | #endif |