diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-05-27 19:22:08 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-05-27 19:25:04 -0400 |
| commit | b1829d2705daa7cb72eb1e08bdc8b7e9fad34266 (patch) | |
| tree | 2be273d7b2902ee3b789c63337437c65479f4660 | |
| parent | 492a7ea5bcf263ee02a9eb6a3ab0222a1946fade (diff) | |
ftrace: fix merge
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| -rw-r--r-- | include/linux/ftrace.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h index ffbbd54a720e..b482fe88bc04 100644 --- a/include/linux/ftrace.h +++ b/include/linux/ftrace.h | |||
| @@ -122,7 +122,7 @@ static inline void tracer_disable(void) | |||
| 122 | # define trace_preempt_off(a0, a1) do { } while (0) | 122 | # define trace_preempt_off(a0, a1) do { } while (0) |
| 123 | #endif | 123 | #endif |
| 124 | 124 | ||
| 125 | #ifdef CONFIG_CONTEXT_SWITCH_TRACER | 125 | #ifdef CONFIG_TRACING |
| 126 | extern void | 126 | extern void |
| 127 | ftrace_special(unsigned long arg1, unsigned long arg2, unsigned long arg3); | 127 | ftrace_special(unsigned long arg1, unsigned long arg2, unsigned long arg3); |
| 128 | #else | 128 | #else |