summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-12-08 16:55:53 +0100
committerIngo Molnar <mingo@elte.hu>2008-12-08 16:55:53 +0100
commite726f5f91effd8944c76475a2688093a03ba0d10 (patch)
tree37cbbf592a2b667d2787e0db4235e87fc91bc43f
parent380c4b1411ccd6885f92b2c8ceb08433a720f44e (diff)
downloadop-kernel-dev-e726f5f91effd8944c76475a2688093a03ba0d10.zip
op-kernel-dev-e726f5f91effd8944c76475a2688093a03ba0d10.tar.gz
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: Ingo Molnar <mingo@elte.hu>
-rw-r--r--kernel/trace/trace.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 0b8659b..8ebe007 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -3596,9 +3596,9 @@ int trace_vprintk(unsigned long ip, int depth, const char *fmt, va_list args)
struct ring_buffer_event *event;
struct trace_array *tr = &global_trace;
struct trace_array_cpu *data;
- struct print_entry *entry;
- unsigned long flags, irq_flags;
int cpu, len = 0, size, pc;
+ struct print_entry *entry;
+ unsigned long irq_flags;
if (tracing_disabled || tracing_selftest_running)
return 0;
@@ -3623,7 +3623,7 @@ int trace_vprintk(unsigned long ip, int depth, const char *fmt, va_list args)
if (!event)
goto out_unlock;
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->ip = ip;
entry->depth = depth;
OpenPOWER on IntegriCloud