libperf: Remove reference to non-uapi header
PATCH 1/1 libperf: Remove reference to non-uapi header
Fix build with libperf:
$ gcc ./tools/lib/perf/Documentation/examples/counting.c -lperf
In file included from ./tools/lib/perf/Documentation/examples/counting.c:8:
/usr/include/perf/event.h:9:10: fatal error: linux/compiler.h: No such file or directory
9 | #include <linux/compiler.h>
| ^~~~~~~~~~~~~~~~~~
compilation terminated.Fixes b2f10cd4e805 ("perf cpumap: Fix alignment for masks in event encoding")
Cc Ian Rogers <[email protected]>
Signed-off-by Vitaly Chikunov <[email protected]>
--- tools/lib/perf/include/perf/event.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
tools/lib/perf/include/perf/event.h +2 -3
@@ -6,7 +6,6 @@#include <linux/types.h> #include <linux/limits.h> #include <linux/bpf.h> -#include <linux/compiler.h> #include <sys/types.h> /* pid_t */ #define event_contains (obj, mem) ((obj).header.size > offsetof(typeof(obj), mem))
@@ -195,7 +194,7 @@ struct perf_record_mask_cpu_map64 {#pragma GCC diagnostic ignored "-Wpacked"#pragma GCC diagnostic ignored "-Wattributes" -struct __packed perf_record_cpu_map_data { +struct perf_record_cpu_map_data {__u16 type;union {/* Used when type == PERF_CPU_MAP__CPUS. */
@@ -205,7 +204,7 @@ struct __packed perf_record_cpu_map_data {/* Used when type == PERF_CPU_MAP__MASK and long_size == 8. */ struct perf_record_mask_cpu_map64 mask64_data; }; -}; +} __attribute__ ((__packed__));#pragma GCC diagnostic pop
Signature · 1 line
2.33.4
Quoted 9 lines · Vitaly Chikunov
Fix build with libperf:
$ gcc ./tools/lib/perf/Documentation/examples/counting.c -lperf In file included from ./tools/lib/perf/Documentation/examples/counting.c:8: /usr/include/perf/event.h:9:10: fatal error: linux/compiler.h: No such file or directory 9 | #include <linux/compiler.h> | ^~~~~~~~~~~~~~~~~~ compilation terminated.
Quoted 3 lines
Fixes b2f10cd4e805 ("perf cpumap: Fix alignment for masks in event encoding")Cc Ian Rogers <[email protected]>Signed-off-by Vitaly Chikunov <[email protected]>
Reviewed-by Dmitry V. Levin <[email protected]>
Signature · 1 line
ldv
Em Thu, Oct 06, 2022 at 07:29:19PM +0300, Vitaly Chikunov escreveu:
Quoted 9 lines
Fix build with libperf:
$ gcc ./tools/lib/perf/Documentation/examples/counting.c -lperf In file included from ./tools/lib/perf/Documentation/examples/counting.c:8: /usr/include/perf/event.h:9:10: fatal error: linux/compiler.h: No such file or directory 9 | #include <linux/compiler.h> | ^~~~~~~~~~~~~~~~~~ compilation terminated.
Quoted 3 lines
Fixes b2f10cd4e805 ("perf cpumap: Fix alignment for masks in event encoding")Cc Ian Rogers <[email protected]>Signed-off-by Vitaly Chikunov <[email protected]>
So I'm applying this one instead after re-reading the thread:
From 49b4ee0b20274812198b1ee7840055740d7981a4 Mon Sep 17 00:00:00 2001
From: Arnaldo Carvalho de Melo <[email protected]>
Date: Fri, 14 Oct 2022 10:39:21 -0300
Subject: [PATCH 1/1] libperf: Do not include non-UAPI linux/compiler.h header
Its just for that __packed define, so use it expanded as __attribute__((packed)), like the other files in /usr/include do.
This was problem was preventing building the libperf examples on ALT Linux and Fedora 35, fix it.
Reported-by Vitaly Chikunov <[email protected]>
Acked-by Ian Rogers <[email protected]>
Cc Adrian Hunter <[email protected]>
Cc Dmitry Levin <[email protected]
Cc Ian Rogers <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Namhyung Kim <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/lib/perf/include/perf/event.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
tools/lib/perf/include/perf/event.h +2 -3
@@ -6,7 +6,6 @@#include <linux/types.h> #include <linux/limits.h> #include <linux/bpf.h> -#include <linux/compiler.h> #include <sys/types.h> /* pid_t */ #define event_contains (obj, mem) ((obj).header.size > offsetof(typeof(obj), mem))
@@ -207,7 +206,7 @@ struct perf_record_range_cpu_map {__u16 end_cpu; }; -struct __packed perf_record_cpu_map_data { +struct perf_record_cpu_map_data {__u16 type;union {/* Used when type == PERF_CPU_MAP__CPUS. */
@@ -219,7 +218,7 @@ struct __packed perf_record_cpu_map_data {/* Used when type == PERF_CPU_MAP__RANGE_CPUS. */ struct perf_record_range_cpu_map range_cpu_data; }; -}; +} __attribute__((packed));#pragma GCC diagnostic pop
Signature · 1 line
2.37.3