From b9c5f9e8686e147e0308f4152a063fc63ef7cda1 Mon Sep 17 00:00:00 2001 From: Anton Blanchard Date: Tue, 22 Sep 2009 22:34:24 +1000 Subject: [PATCH] --- yaml --- r: 166437 b: refs/heads/master c: a6f10a2f5d8c2738b3ac05974bdbea3b68a2aecd h: refs/heads/master i: 166435: 9218ed605e1dd518f5340b55614a370fa5bc5a5e v: v3 --- [refs] | 2 +- trunk/include/linux/perf_counter.h | 2 +- trunk/include/linux/perf_event.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1a4f562d8cf9..9e944492da0c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c7f7fea30b7e52c9d4b9cef271110a98d59adcbc +refs/heads/master: a6f10a2f5d8c2738b3ac05974bdbea3b68a2aecd diff --git a/trunk/include/linux/perf_counter.h b/trunk/include/linux/perf_counter.h index 368bd70f1d2d..7b7fbf433cff 100644 --- a/trunk/include/linux/perf_counter.h +++ b/trunk/include/linux/perf_counter.h @@ -361,7 +361,7 @@ enum perf_event_type { * struct perf_event_header header; * u32 pid, ppid; * u32 tid, ptid; - * { u64 time; } && PERF_SAMPLE_TIME + * u64 time; * }; */ PERF_EVENT_FORK = 7, diff --git a/trunk/include/linux/perf_event.h b/trunk/include/linux/perf_event.h index acefaf71e6dd..3a9d36d1e92a 100644 --- a/trunk/include/linux/perf_event.h +++ b/trunk/include/linux/perf_event.h @@ -357,7 +357,7 @@ enum perf_event_type { * struct perf_event_header header; * u32 pid, ppid; * u32 tid, ptid; - * { u64 time; } && PERF_SAMPLE_TIME + * u64 time; * }; */ PERF_RECORD_FORK = 7,