From aa4831ebe1f2787eaa18296eb8d2b552195ac530 Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Tue, 8 Jan 2013 14:44:25 -0500 Subject: [PATCH] --- yaml --- r: 349952 b: refs/heads/master c: b878e7fb22ea48b0585bbbbef249f7efc6d42748 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/uapi/linux/perf_event.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4643390c00a7..9aa3db9590e4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d0528b5d71faf612014dd7672e44225c915344b2 +refs/heads/master: b878e7fb22ea48b0585bbbbef249f7efc6d42748 diff --git a/trunk/include/uapi/linux/perf_event.h b/trunk/include/uapi/linux/perf_event.h index 4f63c05d27c9..9fa9c622a7f4 100644 --- a/trunk/include/uapi/linux/perf_event.h +++ b/trunk/include/uapi/linux/perf_event.h @@ -579,7 +579,8 @@ enum perf_event_type { * { u32 size; * char data[size];}&& PERF_SAMPLE_RAW * - * { u64 from, to, flags } lbr[nr];} && PERF_SAMPLE_BRANCH_STACK + * { u64 nr; + * { u64 from, to, flags } lbr[nr];} && PERF_SAMPLE_BRANCH_STACK * * { u64 abi; # enum perf_sample_regs_abi * u64 regs[weight(mask)]; } && PERF_SAMPLE_REGS_USER