diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2009-02-05 16:12:56 -0200 | 
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-06 01:01:40 +0100 | 
| commit | 0a9877514c4fed10a70720293b37213dd172ee3e (patch) | |
| tree | 7f21548126d448d96116f57f2c7927fa2b2c7ddd /kernel/trace/trace_branch.c | |
| parent | dac74940289f350c2590bec92737833bad608541 (diff) | |
| download | olio-linux-3.10-0a9877514c4fed10a70720293b37213dd172ee3e.tar.xz olio-linux-3.10-0a9877514c4fed10a70720293b37213dd172ee3e.zip  | |
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 027e8369061..770e52acfc1 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)  	struct trace_array *tr = branch_tracer;  	struct ring_buffer_event *event;  	struct trace_branch *entry; -	unsigned long flags, irq_flags; +	unsigned long flags;  	int cpu, pc;  	const char *p; @@ -52,8 +52,7 @@ probe_likely_condition(struct ftrace_branch_data *f, int val, int expect)  	if (atomic_inc_return(&tr->data[cpu]->disabled) != 1)  		goto out; -	event = ring_buffer_lock_reserve(tr->buffer, sizeof(*entry), -					 &irq_flags); +	event = ring_buffer_lock_reserve(tr->buffer, sizeof(*entry));  	if (!event)  		goto out; @@ -75,7 +74,7 @@ probe_likely_condition(struct ftrace_branch_data *f, int val, int expect)  	entry->line = f->line;  	entry->correct = val == expect; -	ring_buffer_unlock_commit(tr->buffer, event, irq_flags); +	ring_buffer_unlock_commit(tr->buffer, event);   out:  	atomic_dec(&tr->data[cpu]->disabled);  |