diff options
| author | Scott Wood <scottwood@freescale.com> | 2014-04-07 23:49:35 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2014-04-07 23:49:35 (GMT) |
| commit | 62b8c978ee6b8d135d9e7953221de58000dba986 (patch) | |
| tree | 683b04b2e627f6710c22c151b23c8cc9a165315e /tools/perf/util/include/linux/compiler.h | |
| parent | 78fd82238d0e5716578c326404184a27ba67fd6e (diff) | |
| download | linux-fsl-qoriq-62b8c978ee6b8d135d9e7953221de58000dba986.tar.xz | |
Rewind v3.13-rc3+ (78fd82238d0e5716) to v3.12
Diffstat (limited to 'tools/perf/util/include/linux/compiler.h')
| -rw-r--r-- | tools/perf/util/include/linux/compiler.h | 19 |
1 files changed, 5 insertions, 14 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 |