diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-12-08 10:55:53 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-12-08 10:55:53 -0500 |
commit | e726f5f91effd8944c76475a2688093a03ba0d10 (patch) | |
tree | 37cbbf592a2b667d2787e0db4235e87fc91bc43f /kernel | |
parent | 380c4b1411ccd6885f92b2c8ceb08433a720f44e (diff) |
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>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/trace/trace.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 0b8659bd5ad2..8ebe0070c47a 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) | |||
3596 | struct ring_buffer_event *event; | 3596 | struct ring_buffer_event *event; |
3597 | struct trace_array *tr = &global_trace; | 3597 | struct trace_array *tr = &global_trace; |
3598 | struct trace_array_cpu *data; | 3598 | struct trace_array_cpu *data; |
3599 | struct print_entry *entry; | ||
3600 | unsigned long flags, irq_flags; | ||
3601 | int cpu, len = 0, size, pc; | 3599 | int cpu, len = 0, size, pc; |
3600 | struct print_entry *entry; | ||
3601 | unsigned long irq_flags; | ||
3602 | 3602 | ||
3603 | if (tracing_disabled || tracing_selftest_running) | 3603 | if (tracing_disabled || tracing_selftest_running) |
3604 | return 0; | 3604 | return 0; |
@@ -3623,7 +3623,7 @@ int trace_vprintk(unsigned long ip, int depth, const char *fmt, va_list args) | |||
3623 | if (!event) | 3623 | if (!event) |
3624 | goto out_unlock; | 3624 | goto out_unlock; |
3625 | entry = ring_buffer_event_data(event); | 3625 | entry = ring_buffer_event_data(event); |
3626 | tracing_generic_entry_update(&entry->ent, flags, pc); | 3626 | tracing_generic_entry_update(&entry->ent, irq_flags, pc); |
3627 | entry->ent.type = TRACE_PRINT; | 3627 | entry->ent.type = TRACE_PRINT; |
3628 | entry->ip = ip; | 3628 | entry->ip = ip; |
3629 | entry->depth = depth; | 3629 | entry->depth = depth; |