---

yaml --- r: 182418 b: refs/heads/master c: 6c9687a h: refs/heads/master v: v3
git-mirror · Jan 29, 2010 · ce46c62 · ce46c62
1 parent e4f930a
commit ce46c62
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c933c1a603d5bf700ddce79216c1be0ec3bc0e6c
+refs/heads/master: 6c9687abeb24d5b7aae7db5be070c2139ad29e29
diff --git a/trunk/arch/x86/kernel/cpu/perf_event.c b/trunk/arch/x86/kernel/cpu/perf_event.c
@@ -1884,6 +1884,7 @@ static void x86_pmu_disable(struct perf_event *event)
 				cpuc->event_list[i-1] = cpuc->event_list[i];
 
 			--cpuc->n_events;
+			break;
 		}
 	}
 	perf_event_update_userpage(event);
-Original file line number
+Diff line change
@@ Expand Up / @@ -1884,6 +1884,7 @@ static void x86_pmu_disable(struct perf_event *event) @@
     				cpuc->event_list[i-1] = cpuc->event_list[i];
     			--cpuc->n_events;
+    			break;
     		}
     	}
     	perf_event_update_userpage(event);
@@ Expand Down @@