korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-16 08:44:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "x86: APIC/SMP: downgrade the NMI watchdog for "nosmp""

Browse Source 
This reverts commit 791b93d3dfaf16c23e978bec0cc0a3dd9d855d63.

A better fix from Maciej will be merged.
This commit is contained in:
Ingo Molnar 2008-06-08 10:14:40 +02:00
parent ab5a5be099
commit 6fe9fe8756
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/x86/kernel/smpboot.c
View File

@ -1159,10 +1159,6 @@ static int __init smp_sanity_check(unsigned max_cpus)
if (!max_cpus) { if (!max_cpus) {
printk(KERN_INFO "SMP mode deactivated.\n"); printk(KERN_INFO "SMP mode deactivated.\n");
smpboot_clear_io_apic(); smpboot_clear_io_apic();
if (nmi_watchdog != NMI_NONE && nmi_watchdog != NMI_DISABLED)
nmi_watchdog = NMI_LOCAL_APIC;
#ifdef CONFIG_X86_32 #ifdef CONFIG_X86_32
connect_bsp_APIC(); connect_bsp_APIC();
#endif #endif