]> git.baikalelectronics.ru Git - kernel.git/commitdiff
libperf: Do not include non-UAPI linux/compiler.h header
authorArnaldo Carvalho de Melo <acme@redhat.com>
Fri, 14 Oct 2022 13:39:21 +0000 (10:39 -0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Fri, 14 Oct 2022 13:44:20 +0000 (10:44 -0300)
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 <vt@altlinux.org>
Acked-by: Ian Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Dmitry Levin <ldv@altlinux.org
Cc: Ian Rogers <irogers@google.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: http://lore.kernel.org/lkml/Y0lnpl2Ix7VljVDc@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/lib/perf/include/perf/event.h

index e282faf8fd75b6a86def83c89bd04dc8208d6b9e..ad47d7b31046c7c96e4663e0de8f4cfa21f5d7e4 100644 (file)
@@ -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