diff --git a/[refs] b/[refs] index c1d72a6b6dfc..f23caeaf8f37 100644 --- 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 index 1fa1a26cb1b3..6e133954e2e4 100644 --- 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 index 8859b97390ec..ef5d8a5b2453 100644 --- 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);