tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

perf: Fix UAPI fallout

The UAPI commits forgot to test tooling builds such as tools/perf/,
and this fixes the fallout.

Manual conversion.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Ingo Molnar and committed by
Linus Torvalds 7d380c8f 3d6ee36d

+11 -11
+2 -2
tools/perf/Makefile
··· 252 252 253 253 LIB_FILE=$(OUTPUT)libperf.a 254 254 255 - LIB_H += ../../include/linux/perf_event.h 255 + LIB_H += ../../include/uapi/linux/perf_event.h 256 256 LIB_H += ../../include/linux/rbtree.h 257 257 LIB_H += ../../include/linux/list.h 258 - LIB_H += ../../include/linux/const.h 258 + LIB_H += ../../include/uapi/linux/const.h 259 259 LIB_H += ../../include/linux/hash.h 260 260 LIB_H += ../../include/linux/stringify.h 261 261 LIB_H += util/include/linux/bitmap.h
+1 -1
tools/perf/perf.h
··· 112 112 #include <sys/types.h> 113 113 #include <sys/syscall.h> 114 114 115 - #include "../../include/linux/perf_event.h" 115 + #include "../../include/uapi/linux/perf_event.h" 116 116 #include "util/types.h" 117 117 #include <stdbool.h> 118 118
+1 -1
tools/perf/util/evsel.c
··· 19 19 #include "thread_map.h" 20 20 #include "target.h" 21 21 #include "../../../include/linux/hw_breakpoint.h" 22 - #include "../../include/linux/perf_event.h" 22 + #include "../../../include/uapi/linux/perf_event.h" 23 23 #include "perf_regs.h" 24 24 25 25 #define FD(e, x, y) (*(int *)xyarray__entry(e->fd, x, y))
+1 -1
tools/perf/util/evsel.h
··· 3 3 4 4 #include <linux/list.h> 5 5 #include <stdbool.h> 6 - #include "../../../include/linux/perf_event.h" 6 + #include "../../../include/uapi/linux/perf_event.h" 7 7 #include "types.h" 8 8 #include "xyarray.h" 9 9 #include "cgroup.h"
+1 -1
tools/perf/util/header.h
··· 1 1 #ifndef __PERF_HEADER_H 2 2 #define __PERF_HEADER_H 3 3 4 - #include "../../../include/linux/perf_event.h" 4 + #include "../../../include/uapi/linux/perf_event.h" 5 5 #include <sys/types.h> 6 6 #include <stdbool.h> 7 7 #include "types.h"
+1 -1
tools/perf/util/include/asm/byteorder.h
··· 1 1 #include <asm/types.h> 2 - #include "../../../../include/linux/swab.h" 2 + #include "../../../../include/uapi/linux/swab.h"
+1 -1
tools/perf/util/include/linux/const.h
··· 1 - #include "../../../../include/linux/const.h" 1 + #include "../../../../include/uapi/linux/const.h"
+1 -1
tools/perf/util/parse-events.h
··· 7 7 #include <linux/list.h> 8 8 #include <stdbool.h> 9 9 #include "types.h" 10 - #include "../../../include/linux/perf_event.h" 10 + #include "../../../include/uapi/linux/perf_event.h" 11 11 #include "types.h" 12 12 13 13 struct list_head;
+1 -1
tools/perf/util/pmu.h
··· 2 2 #define __PMU_H 3 3 4 4 #include <linux/bitops.h> 5 - #include "../../../include/linux/perf_event.h" 5 + #include "../../../include/uapi/linux/perf_event.h" 6 6 7 7 enum { 8 8 PERF_PMU_FORMAT_VALUE_CONFIG,
+1 -1
tools/perf/util/session.h
··· 7 7 #include "symbol.h" 8 8 #include "thread.h" 9 9 #include <linux/rbtree.h> 10 - #include "../../../include/linux/perf_event.h" 10 + #include "../../../include/uapi/linux/perf_event.h" 11 11 12 12 struct sample_queue; 13 13 struct ip_callchain;