Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 7d380c8f1ed2b6768e1fc496ad373f716160fcf0

Authored by Ingo Molnar
Committed by Linus Torvalds
1 parent 3d6ee36dfb
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

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>

Showing 10 changed files with 11 additions and 11 deletions Side-by-side Diff

... ... @@ -252,10 +252,10 @@
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
... ... @@ -112,7 +112,7 @@
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  
tools/perf/util/evsel.c
Diff comments   View file @ 7d380c8
... ... @@ -19,7 +19,7 @@
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))
tools/perf/util/evsel.h
Diff comments   View file @ 7d380c8
... ... @@ -3,7 +3,7 @@
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"
tools/perf/util/header.h
Diff comments   View file @ 7d380c8
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"
tools/perf/util/include/asm/byteorder.h
Diff comments   View file @ 7d380c8
1 1 #include <asm/types.h>
2   -#include "../../../../include/linux/swab.h"
  2 +#include "../../../../include/uapi/linux/swab.h"
tools/perf/util/include/linux/const.h
Diff comments   View file @ 7d380c8
1   -#include "../../../../include/linux/const.h"
  1 +#include "../../../../include/uapi/linux/const.h"
tools/perf/util/parse-events.h
Diff comments   View file @ 7d380c8
... ... @@ -7,7 +7,7 @@
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;
tools/perf/util/pmu.h
Diff comments   View file @ 7d380c8
... ... @@ -2,7 +2,7 @@
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,
tools/perf/util/session.h
Diff comments   View file @ 7d380c8
... ... @@ -7,7 +7,7 @@
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;