[PATCH 1/2] ring_buffer: remove raw from local_irq_save

Steven Rostedt
2008-10-01T04:39:20Z

[-- Attachment #1: ring-buffer-remove-raw.patch --]
[-- Type: text/plain, Size: 1344 bytes --]

The raw_local_irq_save causes issues with lockdep. We don't need it
so replace them with local_irq_save.

Signed-off-by: Steven Rostedt <srostedt@redhat.com>
---
kernel/trace/ring_buffer.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

Index: linux-tip.git/kernel/trace/ring_buffer.c
===================================================================
--- linux-tip.git.orig/kernel/trace/ring_buffer.c 2008-10-01 00:04:39.000000000 -0400
+++ linux-tip.git/kernel/trace/ring_buffer.c 2008-10-01 00:05:07.000000000 -0400
@@ -847,7 +847,7 @@ ring_buffer_lock_reserve(struct ring_buf
if (atomic_read(&buffer->record_disabled))
return NULL;

- raw_local_irq_save(*flags);
+ local_irq_save(*flags);
cpu = raw_smp_processor_id();

if (!cpu_isset(cpu, buffer->cpumask))
@@ -909,7 +909,7 @@ int ring_buffer_unlock_commit(struct rin
rb_commit(cpu_buffer, event);

spin_unlock(&cpu_buffer->lock);
- raw_local_irq_restore(flags);
+ local_irq_restore(flags);

return 0;
}
@@ -1583,13 +1583,13 @@ void ring_buffer_reset_cpu(struct ring_b
if (!cpu_isset(cpu, buffer->cpumask))
return;

- raw_local_irq_save(flags);
+ local_irq_save(flags);
spin_lock(&cpu_buffer->lock);

rb_reset_cpu(cpu_buffer);

spin_unlock(&cpu_buffer->lock);
- raw_local_irq_restore(flags);
+ local_irq_restore(flags);
}

/**

--