---

yaml --- r: 376886 b: refs/heads/master c: 6772faa h: refs/heads/master v: v3
git-mirror · Jun 9, 2013 · aaec885 · aaec885
1 parent 608f93d
commit aaec885
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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");
 
 	/*
-Original file line number
+Diff line change
@@ Expand Up / @@ -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");
     	/*
@@ Expand Down @@