From 75af5f681a560f38c38ef975589bd9b240842369 Mon Sep 17 00:00:00 2001 From: Frederic Weisbecker Date: Thu, 22 Oct 2009 23:23:24 +0200 Subject: [PATCH] --- yaml --- r: 169535 b: refs/heads/master c: 802da5f2289bbe363acef084805195c11f453c48 h: refs/heads/master i: 169533: cf0d7a91da372448165c17e54856ffd0c469bceb 169531: 8766bd1a7f67806a5af07caea7ac861e4c65478f 169527: a77a42ef8f95aebf0d2140d4113144780c6809f1 169519: 841b23b470570d1490ca67d8bf296a75ed3a10fe 169503: 63994279f84e94a2df4b6511c866145c05b19106 169471: 81ebf2682c2b1c5ab9ba474f871d8bb3e1921e0f v: v3 --- [refs] | 2 +- trunk/tools/perf/Makefile | 1 - trunk/tools/perf/util/include/asm/bitops.h | 12 ++++++++++++ trunk/tools/perf/util/include/asm/byteorder.h | 2 +- trunk/tools/perf/util/include/asm/types.h | 17 ----------------- trunk/tools/perf/util/include/linux/types.h | 2 ++ 6 files changed, 16 insertions(+), 20 deletions(-) delete mode 100644 trunk/tools/perf/util/include/asm/types.h diff --git a/[refs] b/[refs] index 227aba4ab606..e74910d35b62 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a4fb581b15949cfd10b64c8af37bc106e95307f3 +refs/heads/master: 802da5f2289bbe363acef084805195c11f453c48 diff --git a/trunk/tools/perf/Makefile b/trunk/tools/perf/Makefile index 65e6e52fe378..0a40c29b2387 100644 --- a/trunk/tools/perf/Makefile +++ b/trunk/tools/perf/Makefile @@ -352,7 +352,6 @@ LIB_H += util/include/asm/bitops.h LIB_H += util/include/asm/byteorder.h LIB_H += util/include/asm/swab.h LIB_H += util/include/asm/system.h -LIB_H += util/include/asm/types.h LIB_H += util/include/asm/uaccess.h LIB_H += perf.h LIB_H += util/event.h diff --git a/trunk/tools/perf/util/include/asm/bitops.h b/trunk/tools/perf/util/include/asm/bitops.h index fbe4d9212919..58e9817ffae0 100644 --- a/trunk/tools/perf/util/include/asm/bitops.h +++ b/trunk/tools/perf/util/include/asm/bitops.h @@ -1,6 +1,18 @@ +#ifndef _PERF_ASM_BITOPS_H_ +#define _PERF_ASM_BITOPS_H_ + +#include +#include "../../types.h" +#include + +/* CHECKME: Not sure both always match */ +#define BITS_PER_LONG __WORDSIZE + #include "../../../../include/asm-generic/bitops/__fls.h" #include "../../../../include/asm-generic/bitops/fls.h" #include "../../../../include/asm-generic/bitops/fls64.h" #include "../../../../include/asm-generic/bitops/__ffs.h" #include "../../../../include/asm-generic/bitops/ffz.h" #include "../../../../include/asm-generic/bitops/hweight.h" + +#endif diff --git a/trunk/tools/perf/util/include/asm/byteorder.h b/trunk/tools/perf/util/include/asm/byteorder.h index 39f367cfaf56..b722abe3a626 100644 --- a/trunk/tools/perf/util/include/asm/byteorder.h +++ b/trunk/tools/perf/util/include/asm/byteorder.h @@ -1,2 +1,2 @@ -#include "../asm/types.h" +#include #include "../../../../include/linux/swab.h" diff --git a/trunk/tools/perf/util/include/asm/types.h b/trunk/tools/perf/util/include/asm/types.h deleted file mode 100644 index 06703c6cd50e..000000000000 --- a/trunk/tools/perf/util/include/asm/types.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef PERF_ASM_TYPES_H_ -#define PERF_ASM_TYPES_H_ - -#include -#include "../../types.h" -#include - -/* CHECKME: Not sure both always match */ -#define BITS_PER_LONG __WORDSIZE - -typedef u64 __u64; -typedef u32 __u32; -typedef u16 __u16; -typedef u8 __u8; -typedef s64 __s64; - -#endif /* PERF_ASM_TYPES_H_ */ diff --git a/trunk/tools/perf/util/include/linux/types.h b/trunk/tools/perf/util/include/linux/types.h index 858a38d08435..196862a81a21 100644 --- a/trunk/tools/perf/util/include/linux/types.h +++ b/trunk/tools/perf/util/include/linux/types.h @@ -1,6 +1,8 @@ #ifndef _PERF_LINUX_TYPES_H_ #define _PERF_LINUX_TYPES_H_ +#include + #define DECLARE_BITMAP(name,bits) \ unsigned long name[BITS_TO_LONGS(bits)]