On Fri, Sep 13, 2013 at 05:31:26PM -0400, Vince Weaver wrote: > So in Adrian Hunter's posted patches the PERF_RECORD_MMAP documentation > is also patched like all the others, with > > struct sample_id sample_id; > > But in this tip message (and in the current linus-git kernel) somehow the > PERF_RECORD_MMAP line of the patch was dropped. > > Was that intentional? No, no idea what happened.. --- Subject: perf: Update ABI comment From: Peter Zijlstra <peterz@xxxxxxxxxxxxx> Date: Fri Sep 13 23:39:17 CEST 2013 For some mysterious reason the sample_id field of PERF_RECORD_MMAP went AWOL. Reported-by: Vince Weaver <vince@xxxxxxxxxx> Signed-off-by: Peter Zijlstra <peterz@xxxxxxxxxxxxx> --- include/uapi/linux/perf_event.h | 1 + 1 file changed, 1 insertion(+) --- a/include/uapi/linux/perf_event.h +++ b/include/uapi/linux/perf_event.h @@ -528,6 +528,7 @@ enum perf_event_type { * u64 len; * u64 pgoff; * char filename[]; + * struct sample_id sample_id; * }; */ PERF_RECORD_MMAP = 1, -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html