Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8925b394 authored by Steven Noonan's avatar Steven Noonan Committed by Ingo Molnar
Browse files

trace: remove pointless ifdefs 



The functions are already 'extern' anyway, so there's no problem
with linkage. Removing these ifdefs also helps find any potential
compiler errors.

Suggested by Andrew Morton.

Signed-off-by: default avatarSteven Noonan <steven@uplinklabs.net>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 71c67d58

kernel/trace/trace.h

+0 −16
Original line number Original line Diff line number Diff line
@@ -319,38 +319,22 @@ extern int DYN_FTRACE_TEST_NAME(void); 
#endif

#endif





#ifdef CONFIG_FTRACE_STARTUP_TEST

#ifdef CONFIG_FTRACE_STARTUP_TEST

#ifdef CONFIG_FTRACE

extern int trace_selftest_startup_function(struct tracer *trace,

extern int trace_selftest_startup_function(struct tracer *trace,

					   struct trace_array *tr);

					   struct trace_array *tr);

#endif

#ifdef CONFIG_IRQSOFF_TRACER

extern int trace_selftest_startup_irqsoff(struct tracer *trace,

extern int trace_selftest_startup_irqsoff(struct tracer *trace,

					  struct trace_array *tr);

					  struct trace_array *tr);

#endif

#ifdef CONFIG_PREEMPT_TRACER

extern int trace_selftest_startup_preemptoff(struct tracer *trace,

extern int trace_selftest_startup_preemptoff(struct tracer *trace,

					     struct trace_array *tr);

					     struct trace_array *tr);

#endif

#if defined(CONFIG_IRQSOFF_TRACER) && defined(CONFIG_PREEMPT_TRACER)

extern int trace_selftest_startup_preemptirqsoff(struct tracer *trace,

extern int trace_selftest_startup_preemptirqsoff(struct tracer *trace,

						 struct trace_array *tr);

						 struct trace_array *tr);

#endif

#ifdef CONFIG_SCHED_TRACER

extern int trace_selftest_startup_wakeup(struct tracer *trace,

extern int trace_selftest_startup_wakeup(struct tracer *trace,

					 struct trace_array *tr);

					 struct trace_array *tr);

#endif

#ifdef CONFIG_NOP_TRACER

extern int trace_selftest_startup_nop(struct tracer *trace,

extern int trace_selftest_startup_nop(struct tracer *trace,

					 struct trace_array *tr);

					 struct trace_array *tr);

#endif

#ifdef CONFIG_CONTEXT_SWITCH_TRACER

extern int trace_selftest_startup_sched_switch(struct tracer *trace,

extern int trace_selftest_startup_sched_switch(struct tracer *trace,

					       struct trace_array *tr);

					       struct trace_array *tr);

#endif

#ifdef CONFIG_SYSPROF_TRACER

extern int trace_selftest_startup_sysprof(struct tracer *trace,

extern int trace_selftest_startup_sysprof(struct tracer *trace,

					       struct trace_array *tr);

					       struct trace_array *tr);

#endif

#endif /* CONFIG_FTRACE_STARTUP_TEST */

#endif /* CONFIG_FTRACE_STARTUP_TEST */





extern void *head_page(struct trace_array_cpu *data);

extern void *head_page(struct trace_array_cpu *data);