---

yaml --- r: 147728 b: refs/heads/master c: cca3f45 h: refs/heads/master v: v3
git-mirror · Jun 11, 2009 · a66e36f · a66e36f
1 parent 6acb80f
commit a66e36f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a308444ceb576d3089f9ca0dfd097eba6f1e623f
+refs/heads/master: cca3f454a85ff42d426401bce7ac804541b2bd03
diff --git a/trunk/include/linux/perf_counter.h b/trunk/include/linux/perf_counter.h
@@ -286,6 +286,7 @@ enum perf_event_type {
 	 * struct {
 	 *	struct perf_event_header	header;
 	 *	u64				time;
+	 *	u64				id;
 	 * };
 	 */
 	PERF_EVENT_THROTTLE		= 5,

diff --git a/trunk/kernel/perf_counter.c b/trunk/kernel/perf_counter.c
@@ -2950,13 +2950,15 @@ static void perf_log_throttle(struct perf_counter *counter, int enable)
 	struct {
 		struct perf_event_header	header;
 		u64				time;
+		u64				id;
 	} throttle_event = {
 		.header = {
 			.type = PERF_EVENT_THROTTLE + 1,
 			.misc = 0,
 			.size = sizeof(throttle_event),
 		},
-		.time = sched_clock(),
+		.time	= sched_clock(),
+		.id	= counter->id,
 	};
 
 	ret = perf_output_begin(&handle, counter, sizeof(throttle_event), 1, 0);