diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-05-09 19:34:30 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-05-09 19:34:30 +0200 |
| commit | c4f400e837713f677de94390c57e7dc7567e0286 (patch) | |
| tree | 4bbaa58f826152212ad8394be8442112b4aac04b /include | |
| parent | cb04ff9ac424d0e689d9b612e9f73cb443ab4b7e (diff) | |
| parent | 68179686ac67cb08f08b1ef28b860d5ed899f242 (diff) | |
| download | linux-c4f400e837713f677de94390c57e7dc7567e0286.tar.gz linux-c4f400e837713f677de94390c57e7dc7567e0286.tar.bz2 linux-c4f400e837713f677de94390c57e7dc7567e0286.zip | |
Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/core
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/ftrace.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h index 0b5590330bca..d32cc5e4b0cc 100644 --- a/include/linux/ftrace.h +++ b/include/linux/ftrace.h @@ -491,8 +491,12 @@ static inline void __ftrace_enabled_restore(int enabled) extern void trace_preempt_on(unsigned long a0, unsigned long a1); extern void trace_preempt_off(unsigned long a0, unsigned long a1); #else - static inline void trace_preempt_on(unsigned long a0, unsigned long a1) { } - static inline void trace_preempt_off(unsigned long a0, unsigned long a1) { } +/* + * Use defines instead of static inlines because some arches will make code out + * of the CALLER_ADDR, when we really want these to be a real nop. + */ +# define trace_preempt_on(a0, a1) do { } while (0) +# define trace_preempt_off(a0, a1) do { } while (0) #endif #ifdef CONFIG_FTRACE_MCOUNT_RECORD |