From 2bc59bfe4fb5783d29e6bd5683d1462b5f6d1cb8 Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Fri, 3 Jun 2011 17:59:51 -0400 Subject: [PATCH] --- yaml --- r: 253268 b: refs/heads/master c: d7ebe75b065a7c2d58ffc12f9d2e00d5ea4e71eb h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/perf_event.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index f9c8fe4d3b0c..91daedf23bb3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aa4a221875873d2a1f9656cb7fd7e545e952b4fa +refs/heads/master: d7ebe75b065a7c2d58ffc12f9d2e00d5ea4e71eb diff --git a/trunk/include/linux/perf_event.h b/trunk/include/linux/perf_event.h index 3412684ce5d5..e0786e35f247 100644 --- a/trunk/include/linux/perf_event.h +++ b/trunk/include/linux/perf_event.h @@ -137,14 +137,14 @@ enum perf_event_sample_format { * * struct read_format { * { u64 value; - * { u64 time_enabled; } && PERF_FORMAT_ENABLED - * { u64 time_running; } && PERF_FORMAT_RUNNING + * { u64 time_enabled; } && PERF_FORMAT_TOTAL_TIME_ENABLED + * { u64 time_running; } && PERF_FORMAT_TOTAL_TIME_RUNNING * { u64 id; } && PERF_FORMAT_ID * } && !PERF_FORMAT_GROUP * * { u64 nr; - * { u64 time_enabled; } && PERF_FORMAT_ENABLED - * { u64 time_running; } && PERF_FORMAT_RUNNING + * { u64 time_enabled; } && PERF_FORMAT_TOTAL_TIME_ENABLED + * { u64 time_running; } && PERF_FORMAT_TOTAL_TIME_RUNNING * { u64 value; * { u64 id; } && PERF_FORMAT_ID * } cntr[nr];