Skip to content

Commit

Permalink
perf_counter: fix nmi-watchdog interaction
Browse files Browse the repository at this point in the history
When we don't have any perf-counters active, don't act like we know
what the NMI is for.

[ Impact: fix hard hang with nmi_watchdog=2 ]

Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
LKML-Reference: <20090501102533.109867793@chello.nl>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Peter Zijlstra authored and Ingo Molnar committed May 1, 2009
1 parent c33a0bc commit 63a809a
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions arch/x86/kernel/cpu/perf_counter.c
Original file line number Diff line number Diff line change
Expand Up @@ -871,6 +871,9 @@ perf_counter_nmi_handler(struct notifier_block *self,
struct pt_regs *regs;
int ret;

if (!atomic_read(&num_counters))
return NOTIFY_DONE;

switch (cmd) {
case DIE_NMI:
case DIE_NMI_IPI:
Expand Down

0 comments on commit 63a809a

Please sign in to comment.