aboutsummaryrefslogtreecommitdiffstats
path: root/tools/perf
diff options
context:
space:
mode:
Diffstat (limited to 'tools/perf')
-rw-r--r--tools/perf/Makefile1
-rw-r--r--tools/perf/util/include/asm/bitops.h12
-rw-r--r--tools/perf/util/include/asm/byteorder.h2
-rw-r--r--tools/perf/util/include/asm/types.h17
-rw-r--r--tools/perf/util/include/linux/types.h2
5 files changed, 15 insertions, 19 deletions
diff --git a/tools/perf/Makefile b/tools/perf/Makefile
index 65e6e52fe378..0a40c29b2387 100644
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@ -352,7 +352,6 @@ LIB_H += util/include/asm/bitops.h
352LIB_H += util/include/asm/byteorder.h 352LIB_H += util/include/asm/byteorder.h
353LIB_H += util/include/asm/swab.h 353LIB_H += util/include/asm/swab.h
354LIB_H += util/include/asm/system.h 354LIB_H += util/include/asm/system.h
355LIB_H += util/include/asm/types.h
356LIB_H += util/include/asm/uaccess.h 355LIB_H += util/include/asm/uaccess.h
357LIB_H += perf.h 356LIB_H += perf.h
358LIB_H += util/event.h 357LIB_H += util/event.h
diff --git a/tools/perf/util/include/asm/bitops.h b/tools/perf/util/include/asm/bitops.h
index fbe4d9212919..58e9817ffae0 100644
--- a/tools/perf/util/include/asm/bitops.h
+++ b/tools/perf/util/include/asm/bitops.h
@@ -1,6 +1,18 @@
1#ifndef _PERF_ASM_BITOPS_H_
2#define _PERF_ASM_BITOPS_H_
3
4#include <sys/types.h>
5#include "../../types.h"
6#include <linux/compiler.h>
7
8/* CHECKME: Not sure both always match */
9#define BITS_PER_LONG __WORDSIZE
10
1#include "../../../../include/asm-generic/bitops/__fls.h" 11#include "../../../../include/asm-generic/bitops/__fls.h"
2#include "../../../../include/asm-generic/bitops/fls.h" 12#include "../../../../include/asm-generic/bitops/fls.h"
3#include "../../../../include/asm-generic/bitops/fls64.h" 13#include "../../../../include/asm-generic/bitops/fls64.h"
4#include "../../../../include/asm-generic/bitops/__ffs.h" 14#include "../../../../include/asm-generic/bitops/__ffs.h"
5#include "../../../../include/asm-generic/bitops/ffz.h" 15#include "../../../../include/asm-generic/bitops/ffz.h"
6#include "../../../../include/asm-generic/bitops/hweight.h" 16#include "../../../../include/asm-generic/bitops/hweight.h"
17
18#endif
diff --git a/tools/perf/util/include/asm/byteorder.h b/tools/perf/util/include/asm/byteorder.h
index 39f367cfaf56..b722abe3a626 100644
--- a/tools/perf/util/include/asm/byteorder.h
+++ b/tools/perf/util/include/asm/byteorder.h
@@ -1,2 +1,2 @@
1#include "../asm/types.h" 1#include <asm/types.h>
2#include "../../../../include/linux/swab.h" 2#include "../../../../include/linux/swab.h"
diff --git a/tools/perf/util/include/asm/types.h b/tools/perf/util/include/asm/types.h
deleted file mode 100644
index 06703c6cd50e..000000000000
--- a/tools/perf/util/include/asm/types.h
+++ /dev/null
@@ -1,17 +0,0 @@
1#ifndef PERF_ASM_TYPES_H_
2#define PERF_ASM_TYPES_H_
3
4#include <linux/compiler.h>
5#include "../../types.h"
6#include <sys/types.h>
7
8/* CHECKME: Not sure both always match */
9#define BITS_PER_LONG __WORDSIZE
10
11typedef u64 __u64;
12typedef u32 __u32;
13typedef u16 __u16;
14typedef u8 __u8;
15typedef s64 __s64;
16
17#endif /* PERF_ASM_TYPES_H_ */
diff --git a/tools/perf/util/include/linux/types.h b/tools/perf/util/include/linux/types.h
index 858a38d08435..196862a81a21 100644
--- a/tools/perf/util/include/linux/types.h
+++ b/tools/perf/util/include/linux/types.h
@@ -1,6 +1,8 @@
1#ifndef _PERF_LINUX_TYPES_H_ 1#ifndef _PERF_LINUX_TYPES_H_
2#define _PERF_LINUX_TYPES_H_ 2#define _PERF_LINUX_TYPES_H_
3 3
4#include <asm/types.h>
5
4#define DECLARE_BITMAP(name,bits) \ 6#define DECLARE_BITMAP(name,bits) \
5 unsigned long name[BITS_TO_LONGS(bits)] 7 unsigned long name[BITS_TO_LONGS(bits)]
6 8