]> nv-tegra.nvidia Code Review - linux-2.6.git/blobdiff - arch/x86_64/kernel/nmi.c
[PATCH] x86_64: Switch SMP bootup over to new CPU hotplug state machine
[linux-2.6.git] / arch / x86_64 / kernel / nmi.c
index d9867de6a6263bfbc8843e6798bef6f44a1c7eec..72f40ca4f06b827215beaeba48e94d9898938636 100644 (file)
@@ -130,12 +130,6 @@ int __init check_nmi_watchdog (void)
        mdelay((10*1000)/nmi_hz); // wait 10 ticks
 
        for (cpu = 0; cpu < NR_CPUS; cpu++) {
-#ifdef CONFIG_SMP
-               /* Check cpu_callin_map here because that is set
-                  after the timer is started. */
-               if (!cpu_isset(cpu, cpu_callin_map))
-                       continue;
-#endif
                if (cpu_pda[cpu].__nmi_count - counts[cpu] <= 5) {
                        printk("CPU#%d: NMI appears to be stuck (%d)!\n", 
                               cpu,
@@ -336,7 +330,7 @@ void setup_apic_nmi_watchdog(void)
 {
        switch (boot_cpu_data.x86_vendor) {
        case X86_VENDOR_AMD:
-               if (boot_cpu_data.x86 < 6)
+               if (boot_cpu_data.x86 != 15)
                        return;
                if (strstr(boot_cpu_data.x86_model_id, "Screwdriver"))
                        return;