---

yaml --- r: 147414 b: refs/heads/master c: 63a809a h: refs/heads/master v: v3
git-mirror · May 1, 2009 · 45019a7 · 45019a7
1 parent a6c9566
commit 45019a7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c33a0bc4e41ef169d6e807d8abb9502544b518e5
+refs/heads/master: 63a809a2dc53b91268dd915bbcbd425063893676
diff --git a/trunk/arch/x86/kernel/cpu/perf_counter.c b/trunk/arch/x86/kernel/cpu/perf_counter.c
@@ -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: