summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-06 01:12:02 +0100
committerIngo Molnar <mingo@elte.hu>2009-02-06 01:14:05 +0100
commit304cc6ae1bf7a8e6d00053fbe0b7e2b26cdddda2 (patch)
tree2fab76394a32e42cd63d353bb8d943b4b7851825
parentb6f11df26fdc28324cf9c9e3b77f2dc985c1bb13 (diff)
downloadlinux-stable-304cc6ae1bf7a8e6d00053fbe0b7e2b26cdddda2.tar.gz
linux-stable-304cc6ae1bf7a8e6d00053fbe0b7e2b26cdddda2.tar.bz2
linux-stable-304cc6ae1bf7a8e6d00053fbe0b7e2b26cdddda2.zip
ring_buffer: remove unused flags parameter, fix
Oprofile's ring-buffer use was not considered. Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--drivers/oprofile/cpu_buffer.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/oprofile/cpu_buffer.c b/drivers/oprofile/cpu_buffer.c
index e76d715e4342..f0e99d4c066b 100644
--- a/drivers/oprofile/cpu_buffer.c
+++ b/drivers/oprofile/cpu_buffer.c
@@ -161,7 +161,7 @@ struct op_sample
{
entry->event = ring_buffer_lock_reserve
(op_ring_buffer_write, sizeof(struct op_sample) +
- size * sizeof(entry->sample->data[0]), &entry->irq_flags);
+ size * sizeof(entry->sample->data[0]));
if (entry->event)
entry->sample = ring_buffer_event_data(entry->event);
else
@@ -178,8 +178,7 @@ struct op_sample
int op_cpu_buffer_write_commit(struct op_entry *entry)
{
- return ring_buffer_unlock_commit(op_ring_buffer_write, entry->event,
- entry->irq_flags);
+ return ring_buffer_unlock_commit(op_ring_buffer_write, entry->event);
}
struct op_sample *op_cpu_buffer_read_entry(struct op_entry *entry, int cpu)