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

Commit e726f5f9 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

tracing/function-graph-tracer: fix 'flags' variable mismatch 



this warning:

 kernel/trace/trace.c: In function ‘trace_vprintk’:
 kernel/trace/trace.c:3626: warning: ‘flags’ may be used uninitialized in this function

shows some confusion about irq_flags / flags use here. We already have
irq_flags so remove the extra flags variable.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 380c4b14

kernel/trace/trace.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -3596,9 +3596,9 @@ int trace_vprintk(unsigned long ip, int depth, const char *fmt, va_list args) 
	struct ring_buffer_event *event;

	struct ring_buffer_event *event;

	struct trace_array *tr = &global_trace;

	struct trace_array *tr = &global_trace;

	struct trace_array_cpu *data;

	struct trace_array_cpu *data;

	struct print_entry *entry;

	unsigned long flags, irq_flags;

	int cpu, len = 0, size, pc;

	int cpu, len = 0, size, pc;

	struct print_entry *entry;

	unsigned long irq_flags;





	if (tracing_disabled || tracing_selftest_running)

	if (tracing_disabled || tracing_selftest_running)

		return 0;

		return 0;
@@ -3623,7 +3623,7 @@ int trace_vprintk(unsigned long ip, int depth, const char *fmt, va_list args) 
	if (!event)

	if (!event)

		goto out_unlock;

		goto out_unlock;

	entry = ring_buffer_event_data(event);

	entry = ring_buffer_event_data(event);

	tracing_generic_entry_update(&entry->ent, flags, pc);

	tracing_generic_entry_update(&entry->ent, irq_flags, pc);

	entry->ent.type			= TRACE_PRINT;

	entry->ent.type			= TRACE_PRINT;

	entry->ip			= ip;

	entry->ip			= ip;

	entry->depth			= depth;

	entry->depth			= depth;