diff options
Diffstat (limited to 'tools/perf/util/include')
| -rw-r--r-- | tools/perf/util/include/asm/bug.h | 22 | ||||
| -rw-r--r-- | tools/perf/util/include/asm/hash.h | 6 | ||||
| -rw-r--r-- | tools/perf/util/include/dwarf-regs.h | 2 | ||||
| -rw-r--r-- | tools/perf/util/include/linux/bitmap.h | 3 | ||||
| -rw-r--r-- | tools/perf/util/include/linux/bitops.h | 4 | ||||
| -rw-r--r-- | tools/perf/util/include/linux/compiler.h | 21 | ||||
| -rw-r--r-- | tools/perf/util/include/linux/export.h | 6 | ||||
| -rw-r--r-- | tools/perf/util/include/linux/hash.h | 5 | ||||
| -rw-r--r-- | tools/perf/util/include/linux/kernel.h | 6 | ||||
| -rw-r--r-- | tools/perf/util/include/linux/list.h | 2 | ||||
| -rw-r--r-- | tools/perf/util/include/linux/magic.h | 12 | ||||
| -rw-r--r-- | tools/perf/util/include/linux/prefetch.h | 6 | ||||
| -rw-r--r-- | tools/perf/util/include/linux/types.h | 29 | 
13 files changed, 14 insertions, 110 deletions
diff --git a/tools/perf/util/include/asm/bug.h b/tools/perf/util/include/asm/bug.h deleted file mode 100644 index 7fcc6810adc..00000000000 --- a/tools/perf/util/include/asm/bug.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef _PERF_ASM_GENERIC_BUG_H -#define _PERF_ASM_GENERIC_BUG_H - -#define __WARN_printf(arg...)	do { fprintf(stderr, arg); } while (0) - -#define WARN(condition, format...) ({		\ -	int __ret_warn_on = !!(condition);	\ -	if (unlikely(__ret_warn_on))		\ -		__WARN_printf(format);		\ -	unlikely(__ret_warn_on);		\ -}) - -#define WARN_ONCE(condition, format...)	({	\ -	static int __warned;			\ -	int __ret_warn_once = !!(condition);	\ -						\ -	if (unlikely(__ret_warn_once))		\ -		if (WARN(!__warned, format)) 	\ -			__warned = 1;		\ -	unlikely(__ret_warn_once);		\ -}) -#endif diff --git a/tools/perf/util/include/asm/hash.h b/tools/perf/util/include/asm/hash.h new file mode 100644 index 00000000000..d82b170bb21 --- /dev/null +++ b/tools/perf/util/include/asm/hash.h @@ -0,0 +1,6 @@ +#ifndef __ASM_GENERIC_HASH_H +#define __ASM_GENERIC_HASH_H + +/* Stub */ + +#endif /* __ASM_GENERIC_HASH_H */ diff --git a/tools/perf/util/include/dwarf-regs.h b/tools/perf/util/include/dwarf-regs.h index cf6727e99c4..8f149655f49 100644 --- a/tools/perf/util/include/dwarf-regs.h +++ b/tools/perf/util/include/dwarf-regs.h @@ -1,7 +1,7 @@  #ifndef _PERF_DWARF_REGS_H_  #define _PERF_DWARF_REGS_H_ -#ifdef DWARF_SUPPORT +#ifdef HAVE_DWARF_SUPPORT  const char *get_arch_regstr(unsigned int n);  #endif diff --git a/tools/perf/util/include/linux/bitmap.h b/tools/perf/util/include/linux/bitmap.h index bb162e40c76..01ffd12dc79 100644 --- a/tools/perf/util/include/linux/bitmap.h +++ b/tools/perf/util/include/linux/bitmap.h @@ -4,6 +4,9 @@  #include <string.h>  #include <linux/bitops.h> +#define DECLARE_BITMAP(name,bits) \ +	unsigned long name[BITS_TO_LONGS(bits)] +  int __bitmap_weight(const unsigned long *bitmap, int bits);  void __bitmap_or(unsigned long *dst, const unsigned long *bitmap1,  		 const unsigned long *bitmap2, int bits); diff --git a/tools/perf/util/include/linux/bitops.h b/tools/perf/util/include/linux/bitops.h index 45cf10a562b..dadfa7e5428 100644 --- a/tools/perf/util/include/linux/bitops.h +++ b/tools/perf/util/include/linux/bitops.h @@ -87,13 +87,15 @@ static __always_inline unsigned long __ffs(unsigned long word)  	return num;  } +typedef const unsigned long __attribute__((__may_alias__)) long_alias_t; +  /*   * Find the first set bit in a memory region.   */  static inline unsigned long  find_first_bit(const unsigned long *addr, unsigned long size)  { -	const unsigned long *p = addr; +	long_alias_t *p = (long_alias_t *) addr;  	unsigned long result = 0;  	unsigned long tmp; diff --git a/tools/perf/util/include/linux/compiler.h b/tools/perf/util/include/linux/compiler.h deleted file mode 100644 index 96b919dae11..00000000000 --- a/tools/perf/util/include/linux/compiler.h +++ /dev/null @@ -1,21 +0,0 @@ -#ifndef _PERF_LINUX_COMPILER_H_ -#define _PERF_LINUX_COMPILER_H_ - -#ifndef __always_inline -#define __always_inline	inline -#endif -#define __user -#ifndef __attribute_const__ -#define __attribute_const__ -#endif - -#ifndef __maybe_unused -#define __maybe_unused		__attribute__((unused)) -#endif -#define __packed	__attribute__((__packed__)) - -#ifndef __force -#define __force -#endif - -#endif diff --git a/tools/perf/util/include/linux/export.h b/tools/perf/util/include/linux/export.h deleted file mode 100644 index b43e2dc21e0..00000000000 --- a/tools/perf/util/include/linux/export.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef PERF_LINUX_MODULE_H -#define PERF_LINUX_MODULE_H - -#define EXPORT_SYMBOL(name) - -#endif diff --git a/tools/perf/util/include/linux/hash.h b/tools/perf/util/include/linux/hash.h deleted file mode 100644 index 201f5739799..00000000000 --- a/tools/perf/util/include/linux/hash.h +++ /dev/null @@ -1,5 +0,0 @@ -#include "../../../../include/linux/hash.h" - -#ifndef PERF_HASH_H -#define PERF_HASH_H -#endif diff --git a/tools/perf/util/include/linux/kernel.h b/tools/perf/util/include/linux/kernel.h index d8c927c868e..9844c31b7c2 100644 --- a/tools/perf/util/include/linux/kernel.h +++ b/tools/perf/util/include/linux/kernel.h @@ -94,12 +94,6 @@ static inline int scnprintf(char * buf, size_t size, const char * fmt, ...)  	return (i >= ssize) ? (ssize - 1) : i;  } -static inline unsigned long -simple_strtoul(const char *nptr, char **endptr, int base) -{ -	return strtoul(nptr, endptr, base); -} -  int eprintf(int level,  	    const char *fmt, ...) __attribute__((format(printf, 2, 3))); diff --git a/tools/perf/util/include/linux/list.h b/tools/perf/util/include/linux/list.h index 1d928a0ce99..76ddbc72634 100644 --- a/tools/perf/util/include/linux/list.h +++ b/tools/perf/util/include/linux/list.h @@ -1,5 +1,5 @@  #include <linux/kernel.h> -#include <linux/prefetch.h> +#include <linux/types.h>  #include "../../../../include/linux/list.h" diff --git a/tools/perf/util/include/linux/magic.h b/tools/perf/util/include/linux/magic.h deleted file mode 100644 index 58b64ed4da1..00000000000 --- a/tools/perf/util/include/linux/magic.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef _PERF_LINUX_MAGIC_H_ -#define _PERF_LINUX_MAGIC_H_ - -#ifndef DEBUGFS_MAGIC -#define DEBUGFS_MAGIC          0x64626720 -#endif - -#ifndef SYSFS_MAGIC -#define SYSFS_MAGIC            0x62656572 -#endif - -#endif diff --git a/tools/perf/util/include/linux/prefetch.h b/tools/perf/util/include/linux/prefetch.h deleted file mode 100644 index 7841e485d8c..00000000000 --- a/tools/perf/util/include/linux/prefetch.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef PERF_LINUX_PREFETCH_H -#define PERF_LINUX_PREFETCH_H - -static inline void prefetch(void *a __attribute__((unused))) { } - -#endif diff --git a/tools/perf/util/include/linux/types.h b/tools/perf/util/include/linux/types.h deleted file mode 100644 index eb464786c08..00000000000 --- a/tools/perf/util/include/linux/types.h +++ /dev/null @@ -1,29 +0,0 @@ -#ifndef _PERF_LINUX_TYPES_H_ -#define _PERF_LINUX_TYPES_H_ - -#include <asm/types.h> - -#ifndef __bitwise -#define __bitwise -#endif - -#ifndef __le32 -typedef __u32 __bitwise __le32; -#endif - -#define DECLARE_BITMAP(name,bits) \ -	unsigned long name[BITS_TO_LONGS(bits)] - -struct list_head { -	struct list_head *next, *prev; -}; - -struct hlist_head { -	struct hlist_node *first; -}; - -struct hlist_node { -	struct hlist_node *next, **pprev; -}; - -#endif  | 
