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

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

ftrace: remove trace array ctrl 



Impact: remove obsolete variable in trace_array structure

With the new start / stop method of ftrace, the ctrl variable
in the trace_array structure is now obsolete. Remove it.

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

kernel/trace/trace.c

+5 −15
Original line number Diff line number Diff line
@@ -537,7 +537,6 @@ int register_tracer(struct tracer *type) 
	if (type->selftest) {

		struct tracer *saved_tracer = current_trace;

		struct trace_array *tr = &global_trace;

		int saved_ctrl = tr->ctrl;

		int i;

		/*

		 * Run a selftest on this tracer.
@@ -550,13 +549,11 @@ int register_tracer(struct tracer *type) 
			tracing_reset(tr, i);

		}

		current_trace = type;

		tr->ctrl = 0;

		/* the test is responsible for initializing and enabling */

		pr_info("Testing tracer %s: ", type->name);

		ret = type->selftest(type, tr);

		/* the test is responsible for resetting too */

		current_trace = saved_tracer;

		tr->ctrl = saved_ctrl;

		if (ret) {

			printk(KERN_CONT "FAILED!\n");

			goto out;
@@ -966,7 +963,7 @@ ftrace_special(unsigned long arg1, unsigned long arg2, unsigned long arg3) 
	int cpu;

	int pc;



	if (tracing_disabled || !tr->ctrl)

	if (tracing_disabled)

		return;



	pc = preempt_count();
@@ -2820,7 +2817,6 @@ tracing_entries_write(struct file *filp, const char __user *ubuf, 
	unsigned long val;

	char buf[64];

	int ret;

	struct trace_array *tr = filp->private_data;



	if (cnt >= sizeof(buf))

		return -EINVAL;
@@ -2840,12 +2836,7 @@ tracing_entries_write(struct file *filp, const char __user *ubuf, 


	mutex_lock(&trace_types_lock);



	if (tr->ctrl) {

		cnt = -EBUSY;

		pr_info("ftrace: please disable tracing"

			" before modifying buffer size\n");

		goto out;

	}

	tracing_stop();



	if (val != global_trace.entries) {

		ret = ring_buffer_resize(global_trace.buffer, val);
@@ -2878,6 +2869,7 @@ tracing_entries_write(struct file *filp, const char __user *ubuf, 
	if (tracing_disabled)

		cnt = -ENOMEM;

 out:

	tracing_start();

	max_tr.entries = global_trace.entries;

	mutex_unlock(&trace_types_lock);
@@ -2900,9 +2892,8 @@ tracing_mark_write(struct file *filp, const char __user *ubuf, 
{

	char *buf;

	char *end;

	struct trace_array *tr = &global_trace;



	if (!tr->ctrl || tracing_disabled)

	if (tracing_disabled)

		return -EINVAL;



	if (cnt > TRACE_BUF_SIZE)
@@ -3131,7 +3122,7 @@ int trace_vprintk(unsigned long ip, const char *fmt, va_list args) 
	unsigned long flags, irq_flags;

	int cpu, len = 0, size, pc;



	if (!tr->ctrl || tracing_disabled)

	if (tracing_disabled)

		return 0;



	pc = preempt_count();
@@ -3365,7 +3356,6 @@ __init static int tracer_alloc_buffers(void) 
#endif



	/* All seems OK, enable tracing */

	global_trace.ctrl = 1;

	tracing_disabled = 0;



	atomic_notifier_chain_register(&panic_notifier_list,

kernel/trace/trace.h

+0 −1
Original line number Diff line number Diff line
@@ -172,7 +172,6 @@ struct trace_iterator; 
struct trace_array {

	struct ring_buffer	*buffer;

	unsigned long		entries;

	long			ctrl;

	int			cpu;

	cycle_t			time_start;

	struct task_struct	*waiter;

kernel/trace/trace_functions.c

+2 −4
Original line number Diff line number Diff line
@@ -44,13 +44,11 @@ static void stop_function_trace(struct trace_array *tr) 


static void function_trace_init(struct trace_array *tr)

{

	if (tr->ctrl)

	start_function_trace(tr);

}



static void function_trace_reset(struct trace_array *tr)

{

	if (tr->ctrl)

	stop_function_trace(tr);

}

kernel/trace/trace_irqsoff.c

+2 −5
Original line number Diff line number Diff line
@@ -383,14 +383,11 @@ static void __irqsoff_tracer_init(struct trace_array *tr) 
	irqsoff_trace = tr;

	/* make sure that the tracer is visible */

	smp_wmb();



	if (tr->ctrl)

	start_irqsoff_tracer(tr);

}



static void irqsoff_tracer_reset(struct trace_array *tr)

{

	if (tr->ctrl)

	stop_irqsoff_tracer(tr);

}

kernel/trace/trace_mmiotrace.c

+5 −6
Original line number Diff line number Diff line
@@ -34,16 +34,15 @@ static void mmio_trace_init(struct trace_array *tr) 
{

	pr_debug("in %s\n", __func__);

	mmio_trace_array = tr;

	if (tr->ctrl) {



	mmio_reset_data(tr);

	enable_mmiotrace();

}

}



static void mmio_trace_reset(struct trace_array *tr)

{

	pr_debug("in %s\n", __func__);

	if (tr->ctrl)



	disable_mmiotrace();

	mmio_reset_data(tr);

	mmio_trace_array = NULL;