summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-05-28 01:22:08 +0200
committerIngo Molnar <mingo@elte.hu>2008-05-28 01:25:04 +0200
commitb1829d2705daa7cb72eb1e08bdc8b7e9fad34266 (patch)
tree2be273d7b2902ee3b789c63337437c65479f4660
parent492a7ea5bcf263ee02a9eb6a3ab0222a1946fade (diff)
downloadop-kernel-dev-b1829d2705daa7cb72eb1e08bdc8b7e9fad34266.zip
op-kernel-dev-b1829d2705daa7cb72eb1e08bdc8b7e9fad34266.tar.gz
ftrace: fix merge
Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--include/linux/ftrace.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h
index ffbbd54..b482fe8 100644
--- a/include/linux/ftrace.h
+++ b/include/linux/ftrace.h
@@ -122,7 +122,7 @@ static inline void tracer_disable(void)
# define trace_preempt_off(a0, a1) do { } while (0)
#endif
-#ifdef CONFIG_CONTEXT_SWITCH_TRACER
+#ifdef CONFIG_TRACING
extern void
ftrace_special(unsigned long arg1, unsigned long arg2, unsigned long arg3);
#else
OpenPOWER on IntegriCloud