Commit d5e57375 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

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: default avatarVitaly Chikunov <vt@altlinux.org>
Acked-by: default avatarIan 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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent fe180a52

tools/lib/perf/include/perf/event.h

+2 −3
Original line number Diff line number Diff line
@@ -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