diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2009-02-05 13:12:56 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-02-05 19:01:40 -0500 |
commit | 0a9877514c4fed10a70720293b37213dd172ee3e (patch) | |
tree | 7f21548126d448d96116f57f2c7927fa2b2c7ddd /kernel/trace/trace_branch.c | |
parent | dac74940289f350c2590bec92737833bad608541 (diff) |
ring_buffer: remove unused flags parameter
Impact: API change, cleanup
>From ring_buffer_{lock_reserve,unlock_commit}.
$ codiff /tmp/vmlinux.before /tmp/vmlinux.after
linux-2.6-tip/kernel/trace/trace.c:
trace_vprintk | -14
trace_graph_return | -14
trace_graph_entry | -10
trace_function | -8
__ftrace_trace_stack | -8
ftrace_trace_userstack | -8
tracing_sched_switch_trace | -8
ftrace_trace_special | -12
tracing_sched_wakeup_trace | -8
9 functions changed, 90 bytes removed, diff: -90
linux-2.6-tip/block/blktrace.c:
__blk_add_trace | -1
1 function changed, 1 bytes removed, diff: -1
/tmp/vmlinux.after:
10 functions changed, 91 bytes removed, diff: -91
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Acked-by: Frédéric Weisbecker <fweisbec@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/trace/trace_branch.c')
-rw-r--r-- | kernel/trace/trace_branch.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/kernel/trace/trace_branch.c b/kernel/trace/trace_branch.c index 027e83690615..770e52acfc10 100644 --- a/kernel/trace/trace_branch.c +++ b/kernel/trace/trace_branch.c | |||
@@ -33,7 +33,7 @@ probe_likely_condition(struct ftrace_branch_data *f, int val, int expect) | |||
33 | struct trace_array *tr = branch_tracer; | 33 | struct trace_array *tr = branch_tracer; |
34 | struct ring_buffer_event *event; | 34 | struct ring_buffer_event *event; |
35 | struct trace_branch *entry; | 35 | struct trace_branch *entry; |
36 | unsigned long flags, irq_flags; | 36 | unsigned long flags; |
37 | int cpu, pc; | 37 | int cpu, pc; |
38 | const char *p; | 38 | const char *p; |
39 | 39 | ||
@@ -52,8 +52,7 @@ probe_likely_condition(struct ftrace_branch_data *f, int val, int expect) | |||
52 | if (atomic_inc_return(&tr->data[cpu]->disabled) != 1) | 52 | if (atomic_inc_return(&tr->data[cpu]->disabled) != 1) |
53 | goto out; | 53 | goto out; |
54 | 54 | ||
55 | event = ring_buffer_lock_reserve(tr->buffer, sizeof(*entry), | 55 | event = ring_buffer_lock_reserve(tr->buffer, sizeof(*entry)); |
56 | &irq_flags); | ||
57 | if (!event) | 56 | if (!event) |
58 | goto out; | 57 | goto out; |
59 | 58 | ||
@@ -75,7 +74,7 @@ probe_likely_condition(struct ftrace_branch_data *f, int val, int expect) | |||
75 | entry->line = f->line; | 74 | entry->line = f->line; |
76 | entry->correct = val == expect; | 75 | entry->correct = val == expect; |
77 | 76 | ||
78 | ring_buffer_unlock_commit(tr->buffer, event, irq_flags); | 77 | ring_buffer_unlock_commit(tr->buffer, event); |
79 | 78 | ||
80 | out: | 79 | out: |
81 | atomic_dec(&tr->data[cpu]->disabled); | 80 | atomic_dec(&tr->data[cpu]->disabled); |