---

yaml --- r: 155724 b: refs/heads/master c: 966ee4d h: refs/heads/master v: v3
git-mirror · Jul 22, 2009 · a5e05c6 · a5e05c6
1 parent d5393a8
commit a5e05c6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a0541234f89c93f313961ce7b28676e11488a5f0
+refs/heads/master: 966ee4d6b887c14159043ac80b8c3661d2bbe5e2
diff --git a/trunk/kernel/perf_counter.c b/trunk/kernel/perf_counter.c
@@ -3217,7 +3217,7 @@ static void perf_log_throttle(struct perf_counter *counter, int enable)
 		u64				stream_id;
 	} throttle_event = {
 		.header = {
-			.type = PERF_EVENT_THROTTLE + 1,
+			.type = PERF_EVENT_THROTTLE,
 			.misc = 0,
 			.size = sizeof(throttle_event),
 		},
@@ -3226,6 +3226,9 @@ static void perf_log_throttle(struct perf_counter *counter, int enable)
 		.stream_id	= counter->id,
 	};
 
+	if (enable)
+		throttle_event.header.type = PERF_EVENT_UNTHROTTLE;
+
 	ret = perf_output_begin(&handle, counter, sizeof(throttle_event), 1, 0);
 	if (ret)
 		return;