ftrace: fix merge
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
parent
492a7ea5bc
commit
b1829d2705
|
@ -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
|
||||||
|
|
Loading…
Reference in New Issue