diff options
author | Ingo Molnar <mingo@kernel.org> | 2012-05-09 13:34:30 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2012-05-09 13:34:30 -0400 |
commit | c4f400e837713f677de94390c57e7dc7567e0286 (patch) | |
tree | 4bbaa58f826152212ad8394be8442112b4aac04b /include/linux | |
parent | cb04ff9ac424d0e689d9b612e9f73cb443ab4b7e (diff) | |
parent | 68179686ac67cb08f08b1ef28b860d5ed899f242 (diff) |
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/linux')
-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 0b5590330bc..d32cc5e4b0c 100644 --- a/include/linux/ftrace.h +++ b/include/linux/ftrace.h | |||
@@ -491,8 +491,12 @@ static inline void __ftrace_enabled_restore(int enabled) | |||
491 | extern void trace_preempt_on(unsigned long a0, unsigned long a1); | 491 | extern void trace_preempt_on(unsigned long a0, unsigned long a1); |
492 | extern void trace_preempt_off(unsigned long a0, unsigned long a1); | 492 | extern void trace_preempt_off(unsigned long a0, unsigned long a1); |
493 | #else | 493 | #else |
494 | static inline void trace_preempt_on(unsigned long a0, unsigned long a1) { } | 494 | /* |
495 | static inline void trace_preempt_off(unsigned long a0, unsigned long a1) { } | 495 | * Use defines instead of static inlines because some arches will make code out |
496 | * of the CALLER_ADDR, when we really want these to be a real nop. | ||
497 | */ | ||
498 | # define trace_preempt_on(a0, a1) do { } while (0) | ||
499 | # define trace_preempt_off(a0, a1) do { } while (0) | ||
496 | #endif | 500 | #endif |
497 | 501 | ||
498 | #ifdef CONFIG_FTRACE_MCOUNT_RECORD | 502 | #ifdef CONFIG_FTRACE_MCOUNT_RECORD |