Commit:     3fb450a327fc098efe6c9f000d470abac354cfcc
Parent:     2f62c94176af875f22ecd01887a550d5d48092fc
Author:     Ingo Molnar <[EMAIL PROTECTED]>
AuthorDate: Wed Oct 17 18:04:34 2007 +0200
Committer:  Thomas Gleixner <[EMAIL PROTECTED]>
CommitDate: Wed Oct 17 20:15:35 2007 +0200

    x86: enable NMI watchdog on nosmp
    if nosmp has been passed as a boot option, but nmi_watchdog=2 has also
    been enabled then keep minimal local APIC functionality around to make
    the watchdog work.
    this allowed me to debug a hard hang that would only occur with a nosmp
    Signed-off-by: Ingo Molnar <[EMAIL PROTECTED]>
    Signed-off-by: Thomas Gleixner <[EMAIL PROTECTED]>
 arch/x86/kernel/smpboot_32.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/arch/x86/kernel/smpboot_32.c b/arch/x86/kernel/smpboot_32.c
index edc9db6..83e4f40 100644
--- a/arch/x86/kernel/smpboot_32.c
+++ b/arch/x86/kernel/smpboot_32.c
@@ -1021,6 +1021,12 @@ static void __init smp_boot_cpus(unsigned int max_cpus)
        if (!max_cpus) {
                smp_found_config = 0;
                printk(KERN_INFO "SMP mode deactivated, forcing use of dummy 
APIC emulation.\n");
+               if (nmi_watchdog == NMI_LOCAL_APIC) {
+                       printk(KERN_INFO "activating minimal APIC for NMI 
watchdog use.\n");
+                       connect_bsp_APIC();
+                       setup_local_APIC();
+               }
                phys_cpu_present_map = physid_mask_of_physid(0);
                cpu_set(0, per_cpu(cpu_sibling_map, 0));
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to