diff options
author | Steven Rostedt <rostedt@goodmis.org> | 2008-10-01 00:29:52 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-10-14 04:39:04 -0400 |
commit | 70255b5e3f1bd1a5af5b1e425ec2c4db7c735112 (patch) | |
tree | 0c948691e0f247b9100eaf151cdafda182b34545 | |
parent | 9e9efffb7848fe53c334996819139b431b983ac2 (diff) |
ring_buffer: remove raw from local_irq_save
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>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r-- | kernel/trace/ring_buffer.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index cfa711374d9a..8e7392fd0db9 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c | |||
@@ -847,7 +847,7 @@ ring_buffer_lock_reserve(struct ring_buffer *buffer, | |||
847 | if (atomic_read(&buffer->record_disabled)) | 847 | if (atomic_read(&buffer->record_disabled)) |
848 | return NULL; | 848 | return NULL; |
849 | 849 | ||
850 | raw_local_irq_save(*flags); | 850 | local_irq_save(*flags); |
851 | cpu = raw_smp_processor_id(); | 851 | cpu = raw_smp_processor_id(); |
852 | 852 | ||
853 | if (!cpu_isset(cpu, buffer->cpumask)) | 853 | if (!cpu_isset(cpu, buffer->cpumask)) |
@@ -909,7 +909,7 @@ int ring_buffer_unlock_commit(struct ring_buffer *buffer, | |||
909 | rb_commit(cpu_buffer, event); | 909 | rb_commit(cpu_buffer, event); |
910 | 910 | ||
911 | spin_unlock(&cpu_buffer->lock); | 911 | spin_unlock(&cpu_buffer->lock); |
912 | raw_local_irq_restore(flags); | 912 | local_irq_restore(flags); |
913 | 913 | ||
914 | return 0; | 914 | return 0; |
915 | } | 915 | } |
@@ -1583,13 +1583,13 @@ void ring_buffer_reset_cpu(struct ring_buffer *buffer, int cpu) | |||
1583 | if (!cpu_isset(cpu, buffer->cpumask)) | 1583 | if (!cpu_isset(cpu, buffer->cpumask)) |
1584 | return; | 1584 | return; |
1585 | 1585 | ||
1586 | raw_local_irq_save(flags); | 1586 | local_irq_save(flags); |
1587 | spin_lock(&cpu_buffer->lock); | 1587 | spin_lock(&cpu_buffer->lock); |
1588 | 1588 | ||
1589 | rb_reset_cpu(cpu_buffer); | 1589 | rb_reset_cpu(cpu_buffer); |
1590 | 1590 | ||
1591 | spin_unlock(&cpu_buffer->lock); | 1591 | spin_unlock(&cpu_buffer->lock); |
1592 | raw_local_irq_restore(flags); | 1592 | local_irq_restore(flags); |
1593 | } | 1593 | } |
1594 | 1594 | ||
1595 | /** | 1595 | /** |