aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/trace/trace_power.c
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2009-02-05 13:12:56 -0500
committerIngo Molnar <mingo@elte.hu>2009-02-05 19:01:40 -0500
commit0a9877514c4fed10a70720293b37213dd172ee3e (patch)
tree7f21548126d448d96116f57f2c7927fa2b2c7ddd /kernel/trace/trace_power.c
parentdac74940289f350c2590bec92737833bad608541 (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_power.c')
-rw-r--r--kernel/trace/trace_power.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/kernel/trace/trace_power.c b/kernel/trace/trace_power.c
index faa6ab7a1f5c..3b1a292d12d2 100644
--- a/kernel/trace/trace_power.c
+++ b/kernel/trace/trace_power.c
@@ -115,7 +115,6 @@ void trace_power_end(struct power_trace *it)
115 struct ring_buffer_event *event; 115 struct ring_buffer_event *event;
116 struct trace_power *entry; 116 struct trace_power *entry;
117 struct trace_array_cpu *data; 117 struct trace_array_cpu *data;
118 unsigned long irq_flags;
119 struct trace_array *tr = power_trace; 118 struct trace_array *tr = power_trace;
120 119
121 if (!trace_power_enabled) 120 if (!trace_power_enabled)
@@ -125,15 +124,14 @@ void trace_power_end(struct power_trace *it)
125 it->end = ktime_get(); 124 it->end = ktime_get();
126 data = tr->data[smp_processor_id()]; 125 data = tr->data[smp_processor_id()];
127 126
128 event = ring_buffer_lock_reserve(tr->buffer, sizeof(*entry), 127 event = ring_buffer_lock_reserve(tr->buffer, sizeof(*entry));
129 &irq_flags);
130 if (!event) 128 if (!event)
131 goto out; 129 goto out;
132 entry = ring_buffer_event_data(event); 130 entry = ring_buffer_event_data(event);
133 tracing_generic_entry_update(&entry->ent, 0, 0); 131 tracing_generic_entry_update(&entry->ent, 0, 0);
134 entry->ent.type = TRACE_POWER; 132 entry->ent.type = TRACE_POWER;
135 entry->state_data = *it; 133 entry->state_data = *it;
136 ring_buffer_unlock_commit(tr->buffer, event, irq_flags); 134 ring_buffer_unlock_commit(tr->buffer, event);
137 135
138 trace_wake_up(); 136 trace_wake_up();
139 137
@@ -148,7 +146,6 @@ void trace_power_mark(struct power_trace *it, unsigned int type,
148 struct ring_buffer_event *event; 146 struct ring_buffer_event *event;
149 struct trace_power *entry; 147 struct trace_power *entry;
150 struct trace_array_cpu *data; 148 struct trace_array_cpu *data;
151 unsigned long irq_flags;
152 struct trace_array *tr = power_trace; 149 struct trace_array *tr = power_trace;
153 150
154 if (!trace_power_enabled) 151 if (!trace_power_enabled)
@@ -162,15 +159,14 @@ void trace_power_mark(struct power_trace *it, unsigned int type,
162 it->end = it->stamp; 159 it->end = it->stamp;
163 data = tr->data[smp_processor_id()]; 160 data = tr->data[smp_processor_id()];
164 161
165 event = ring_buffer_lock_reserve(tr->buffer, sizeof(*entry), 162 event = ring_buffer_lock_reserve(tr->buffer, sizeof(*entry));
166 &irq_flags);
167 if (!event) 163 if (!event)
168 goto out; 164 goto out;
169 entry = ring_buffer_event_data(event); 165 entry = ring_buffer_event_data(event);
170 tracing_generic_entry_update(&entry->ent, 0, 0); 166 tracing_generic_entry_update(&entry->ent, 0, 0);
171 entry->ent.type = TRACE_POWER; 167 entry->ent.type = TRACE_POWER;
172 entry->state_data = *it; 168 entry->state_data = *it;
173 ring_buffer_unlock_commit(tr->buffer, event, irq_flags); 169 ring_buffer_unlock_commit(tr->buffer, event);
174 170
175 trace_wake_up(); 171 trace_wake_up();
176 172