---

yaml --- r: 182485 b: refs/heads/master c: 6667661 h: refs/heads/master i: 182483: 879b6aa v: v3
git-mirror · Feb 26, 2010 · 703f1bc · 703f1bc
1 parent ee70225
commit 703f1bc
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6e37738a2fac964583debe91099bc3248554f6e5
+refs/heads/master: 6667661df4bc76083edf1e08831c20f64429709d
diff --git a/trunk/arch/x86/kernel/cpu/perf_event.c b/trunk/arch/x86/kernel/cpu/perf_event.c
@@ -2009,9 +2009,6 @@ static int intel_pmu_save_and_restart(struct perf_event *event)
 	x86_perf_event_update(event, hwc, idx);
 	ret = x86_perf_event_set_period(event, hwc, idx);
 
-	if (event->state == PERF_EVENT_STATE_ACTIVE)
-		intel_pmu_enable_event(hwc, idx);
-
 	return ret;
 }