diff options
Diffstat (limited to 'tools/perf/util/include/linux')
-rw-r--r-- | tools/perf/util/include/linux/compiler.h | 19 | ||||
-rw-r--r-- | tools/perf/util/include/linux/magic.h | 4 |
2 files changed, 5 insertions, 18 deletions
diff --git a/tools/perf/util/include/linux/compiler.h b/tools/perf/util/include/linux/compiler.h index b003ad7..96b919d 100644 --- a/tools/perf/util/include/linux/compiler.h +++ b/tools/perf/util/include/linux/compiler.h @@ -2,29 +2,20 @@ #define _PERF_LINUX_COMPILER_H_ #ifndef __always_inline -# define __always_inline inline __attribute__((always_inline)) +#define __always_inline inline #endif - #define __user - #ifndef __attribute_const__ -# define __attribute_const__ +#define __attribute_const__ #endif #ifndef __maybe_unused -# define __maybe_unused __attribute__((unused)) -#endif - -#ifndef __packed -# define __packed __attribute__((__packed__)) +#define __maybe_unused __attribute__((unused)) #endif +#define __packed __attribute__((__packed__)) #ifndef __force -# define __force -#endif - -#ifndef __weak -# define __weak __attribute__((weak)) +#define __force #endif #endif diff --git a/tools/perf/util/include/linux/magic.h b/tools/perf/util/include/linux/magic.h index 07d63cf..58b64ed 100644 --- a/tools/perf/util/include/linux/magic.h +++ b/tools/perf/util/include/linux/magic.h @@ -9,8 +9,4 @@ #define SYSFS_MAGIC 0x62656572 #endif -#ifndef PROC_SUPER_MAGIC -#define PROC_SUPER_MAGIC 0x9fa0 -#endif - #endif |