diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-08 12:17:08 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-08 12:17:08 +0200 |
| commit | 4b62ac9a2b859f932afd5625362c927111b7dd9b (patch) | |
| tree | 30b159e2a0ffa635488feae5587640a7c21372f3 /arch/x86/kernel/cpu | |
| parent | Merge branch 'x86/numa' into x86/devel (diff) | |
| parent | Merge branch 'linus' into x86/nmi (diff) | |
| download | linux-4b62ac9a2b859f932afd5625362c927111b7dd9b.tar.xz linux-4b62ac9a2b859f932afd5625362c927111b7dd9b.zip | |
Merge branch 'x86/nmi' into x86/devel
Conflicts:
arch/x86/kernel/nmi.c
arch/x86/kernel/nmi_32.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/cpu')
| -rw-r--r-- | arch/x86/kernel/cpu/perfctr-watchdog.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/perfctr-watchdog.c b/arch/x86/kernel/cpu/perfctr-watchdog.c index f9ae93adffe5..ddda4b64f545 100644 --- a/arch/x86/kernel/cpu/perfctr-watchdog.c +++ b/arch/x86/kernel/cpu/perfctr-watchdog.c @@ -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); } |