From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org
Cc: Ingo Molnar <mingo@elte.hu>, Thomas Gleixner <tglx@linutronix.de>,
Peter Zijlstra <peterz@infradead.org>,
Andrew Morton <akpm@linux-foundation.org>,
Linus Torvalds <torvalds@linux-foundation.org>,
Mathieu Desnoyers <compudj@krystal.dyndns.org>,
Pekka Paalanen <pq@iki.fi>,
Frederic Weisbecker <fweisbec@gmail.com>,
Martin Bligh <mbligh@google.com>,
Steven Rostedt <srostedt@redhat.com>
Subject: [PATCH 1/2] ring_buffer: remove raw from local_irq_save
Date: Wed, 01 Oct 2008 00:29:52 -0400 [thread overview]
Message-ID: <20081001043908.122153176@goodmis.org> (raw)
In-Reply-To: 20081001042951.412019606@goodmis.org
[-- 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);
}
/**
--
next prev parent reply other threads:[~2008-10-01 4:39 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-01 4:29 [PATCH 0/2] ring_buffer: updates for linux-tip Steven Rostedt
2008-10-01 4:29 ` Steven Rostedt [this message]
2008-10-01 5:52 ` [PATCH 1/2] ring_buffer: remove raw from local_irq_save Ingo Molnar
2008-10-01 6:08 ` Ingo Molnar
2008-10-01 6:14 ` Ingo Molnar
2008-10-01 4:29 ` [PATCH 2/2] ring_buffer: implement new locking Steven Rostedt
2008-10-01 6:01 ` Ingo Molnar
2008-10-01 7:20 ` [PATCH 0/2] ring_buffer: updates for linux-tip Frédéric Weisbecker
2008-10-01 7:23 ` Ingo Molnar
2008-10-01 12:32 ` Frédéric Weisbecker
2008-10-01 17:08 ` Frédéric Weisbecker
2008-10-01 17:14 ` [PATCH] ftrace: preempt disable over interrupt disable Steven Rostedt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20081001043908.122153176@goodmis.org \
--to=rostedt@goodmis.org \
--cc=akpm@linux-foundation.org \
--cc=compudj@krystal.dyndns.org \
--cc=fweisbec@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mbligh@google.com \
--cc=mingo@elte.hu \
--cc=peterz@infradead.org \
--cc=pq@iki.fi \
--cc=srostedt@redhat.com \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).