Skip to content

Commit f4b18ff

Browse files
captain5050Ingo Molnar
authored andcommitted
perf/uapi: Fix PERF_RECORD_SAMPLE comments in <uapi/linux/perf_event.h>
AAUX data for PERF_SAMPLE_AUX appears last. PERF_SAMPLE_CGROUP is missing from the comment. This makes the <uapi/linux/perf_event.h> comment match that in the perf_event_open man page. Signed-off-by: Ian Rogers <irogers@google.com> Signed-off-by: Ingo Molnar <mingo@kernel.org> Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Arnaldo Carvalho de Melo <acme@kernel.org> Cc: James Clark <james.clark@linaro.org> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Kan Liang <kan.liang@linux.intel.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: linux-perf-users@vger.kernel.org Link: https://lore.kernel.org/r/20250521221529.2547099-1-irogers@google.com
1 parent b216af2 commit f4b18ff

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

include/uapi/linux/perf_event.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1035,10 +1035,11 @@ enum perf_event_type {
10351035
* { u64 abi; # enum perf_sample_regs_abi
10361036
* u64 regs[weight(mask)]; } && PERF_SAMPLE_REGS_INTR
10371037
* { u64 phys_addr;} && PERF_SAMPLE_PHYS_ADDR
1038-
* { u64 size;
1039-
* char data[size]; } && PERF_SAMPLE_AUX
1038+
* { u64 cgroup;} && PERF_SAMPLE_CGROUP
10401039
* { u64 data_page_size;} && PERF_SAMPLE_DATA_PAGE_SIZE
10411040
* { u64 code_page_size;} && PERF_SAMPLE_CODE_PAGE_SIZE
1041+
* { u64 size;
1042+
* char data[size]; } && PERF_SAMPLE_AUX
10421043
* };
10431044
*/
10441045
PERF_RECORD_SAMPLE = 9,

tools/include/uapi/linux/perf_event.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1035,10 +1035,11 @@ enum perf_event_type {
10351035
* { u64 abi; # enum perf_sample_regs_abi
10361036
* u64 regs[weight(mask)]; } && PERF_SAMPLE_REGS_INTR
10371037
* { u64 phys_addr;} && PERF_SAMPLE_PHYS_ADDR
1038-
* { u64 size;
1039-
* char data[size]; } && PERF_SAMPLE_AUX
1038+
* { u64 cgroup;} && PERF_SAMPLE_CGROUP
10401039
* { u64 data_page_size;} && PERF_SAMPLE_DATA_PAGE_SIZE
10411040
* { u64 code_page_size;} && PERF_SAMPLE_CODE_PAGE_SIZE
1041+
* { u64 size;
1042+
* char data[size]; } && PERF_SAMPLE_AUX
10421043
* };
10431044
*/
10441045
PERF_RECORD_SAMPLE = 9,

0 commit comments

Comments
 (0)