Skip to content

L
linux
Commit b1829d27 authored by Ingo Molnar's avatar Ingo Molnar
Browse files
Options

ftrace: fix merge 

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 492a7ea5
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
include/linux/ftrace.h
View file @ b1829d27
...@@ -122,7 +122,7 @@ static inline void tracer_disable(void) ...@@ -122,7 +122,7 @@ static inline void tracer_disable(void)
# define trace_preempt_off(a0, a1) do { } while (0) # define trace_preempt_off(a0, a1) do { } while (0)
#endif #endif
#ifdef CONFIG_CONTEXT_SWITCH_TRACER #ifdef CONFIG_TRACING
extern void extern void
ftrace_special(unsigned long arg1, unsigned long arg2, unsigned long arg3); ftrace_special(unsigned long arg1, unsigned long arg2, unsigned long arg3);
#else #else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7