This patch does check if CPU is being recongnized before call the unreserve(). Since enable_lapic_nmi_watchdog() does have such a check the same is make sense here too in a sake of code consistency (but nothing more). Signed-off-by: Cyrill Gorcunov --- Index: linux-2.6.git/arch/x86/kernel/cpu/perfctr-watchdog.c ==================================================================== --- linux-2.6.git.orig/arch/x86/kernel/cpu/perfctr-watchdog.c 2008-06-03 20:48:26.000000000 +0400 +++ linux-2.6.git/arch/x86/kernel/cpu/perfctr-watchdog.c 2008-06-03 21:26:00.000000000 +0400 @@ -181,7 +181,9 @@ void disable_lapic_nmi_watchdog(void) return; on_each_cpu(stop_apic_nmi_watchdog, NULL, 0, 1); - wd_ops->unreserve(); + + if (wd_ops) + wd_ops->unreserve(); BUG_ON(atomic_read(&nmi_active) != 0); } -- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/