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

Commit bbf5b1a0 authored by Steven Rostedt's avatar Steven Rostedt Committed by Ingo Molnar
Browse files

ftrace: remove ctrl_update method 



Impact: Remove the ctrl_update tracer method

With the new quick start/stop method of tracing, the ctrl_update
method is out of date.

Signed-off-by: default avatarSteven Rostedt <srostedt@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 49833fc2

kernel/trace/trace.c

+0 −2
Original line number Diff line number Diff line
@@ -3357,8 +3357,6 @@ __init static int tracer_alloc_buffers(void) 


	register_tracer(&nop_trace);

#ifdef CONFIG_BOOT_TRACER

	/* We don't want to launch sched_switch tracer yet */

	global_trace.ctrl = 0;

	register_tracer(&boot_tracer);

	current_trace = &boot_tracer;

	current_trace->init(&global_trace);

kernel/trace/trace.h

+0 −1
Original line number Diff line number Diff line
@@ -244,7 +244,6 @@ struct tracer { 
	ssize_t			(*read)(struct trace_iterator *iter,

					struct file *filp, char __user *ubuf,

					size_t cnt, loff_t *ppos);

	void			(*ctrl_update)(struct trace_array *tr);

#ifdef CONFIG_FTRACE_STARTUP_TEST

	int			(*selftest)(struct tracer *trace,

					    struct trace_array *tr);

kernel/trace/trace_boot.c

+0 −9
Original line number Diff line number Diff line
@@ -58,14 +58,6 @@ static void boot_trace_init(struct trace_array *tr) 
	tracing_sched_switch_assign_trace(tr);

}



static void boot_trace_ctrl_update(struct trace_array *tr)

{

	if (tr->ctrl)

		enable_boot_trace();

	else

		disable_boot_trace();

}



static enum print_line_t initcall_print_line(struct trace_iterator *iter)

{

	int ret;
@@ -102,7 +94,6 @@ struct tracer boot_tracer __read_mostly = 
	.name		= "initcall",

	.init		= boot_trace_init,

	.reset		= reset_boot_trace,

	.ctrl_update	= boot_trace_ctrl_update,

	.print_line	= initcall_print_line,

};

kernel/trace/trace_functions.c

+0 −9
Original line number Diff line number Diff line
@@ -54,14 +54,6 @@ static void function_trace_reset(struct trace_array *tr) 
		stop_function_trace(tr);

}



static void function_trace_ctrl_update(struct trace_array *tr)

{

	if (tr->ctrl)

		start_function_trace(tr);

	else

		stop_function_trace(tr);

}



static void function_trace_start(struct trace_array *tr)

{

	function_reset(tr);
@@ -73,7 +65,6 @@ static struct tracer function_trace __read_mostly = 
	.init	     = function_trace_init,

	.reset	     = function_trace_reset,

	.start	     = function_trace_start,

	.ctrl_update = function_trace_ctrl_update,

#ifdef CONFIG_FTRACE_SELFTEST

	.selftest    = trace_selftest_startup_function,

#endif

kernel/trace/trace_irqsoff.c

+0 −11
Original line number Diff line number Diff line
@@ -394,14 +394,6 @@ static void irqsoff_tracer_reset(struct trace_array *tr) 
		stop_irqsoff_tracer(tr);

}



static void irqsoff_tracer_ctrl_update(struct trace_array *tr)

{

	if (tr->ctrl)

		start_irqsoff_tracer(tr);

	else

		stop_irqsoff_tracer(tr);

}



static void irqsoff_tracer_start(struct trace_array *tr)

{

	tracer_enabled = 1;
@@ -442,7 +434,6 @@ static struct tracer irqsoff_tracer __read_mostly = 
	.stop		= irqsoff_tracer_stop,

	.open		= irqsoff_tracer_open,

	.close		= irqsoff_tracer_close,

	.ctrl_update	= irqsoff_tracer_ctrl_update,

	.print_max	= 1,

#ifdef CONFIG_FTRACE_SELFTEST

	.selftest    = trace_selftest_startup_irqsoff,
@@ -470,7 +461,6 @@ static struct tracer preemptoff_tracer __read_mostly = 
	.stop		= irqsoff_tracer_stop,

	.open		= irqsoff_tracer_open,

	.close		= irqsoff_tracer_close,

	.ctrl_update	= irqsoff_tracer_ctrl_update,

	.print_max	= 1,

#ifdef CONFIG_FTRACE_SELFTEST

	.selftest    = trace_selftest_startup_preemptoff,
@@ -500,7 +490,6 @@ static struct tracer preemptirqsoff_tracer __read_mostly = 
	.stop		= irqsoff_tracer_stop,

	.open		= irqsoff_tracer_open,

	.close		= irqsoff_tracer_close,

	.ctrl_update	= irqsoff_tracer_ctrl_update,

	.print_max	= 1,

#ifdef CONFIG_FTRACE_SELFTEST

	.selftest    = trace_selftest_startup_preemptirqsoff,