From aaec8852054e09eb6494ec356df72171786120b7 Mon Sep 17 00:00:00 2001
From: Michael Ellerman <michael@ellerman.id.au>
Date: Wed, 5 Jun 2013 17:58:20 +0000
Subject: [PATCH] --- yaml --- r: 376886 b: refs/heads/master c:
 6772faa1ba22eba18d087c2459030a683b65be57 h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/arch/powerpc/perf/core-book3s.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8efa5e860d3a..51eb55c9335a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 82a9f16adc12f51c3f8ea59a7c3c120241aff836
+refs/heads/master: 6772faa1ba22eba18d087c2459030a683b65be57
diff --git a/trunk/arch/powerpc/perf/core-book3s.c b/trunk/arch/powerpc/perf/core-book3s.c
index 845c867444e6..29c6482890c8 100644
--- a/trunk/arch/powerpc/perf/core-book3s.c
+++ b/trunk/arch/powerpc/perf/core-book3s.c
@@ -1758,7 +1758,7 @@ static void perf_event_interrupt(struct pt_regs *regs)
 			}
 		}
 	}
-	if ((!found) && printk_ratelimit())
+	if (!found && !nmi && printk_ratelimit())
 		printk(KERN_WARNING "Can't find PMC that caused IRQ\n");
 
 	/*