Home » Mailing list archives » linux-kernel » 2010 » May » 4

Re: [PATCH][GIT PULL] ring-buffer: Wrap open-coded WARN_ONCE

Previous thread: Re: [linux-pm] [PATCH 1/8] PM: Add suspend block api. by Alan Stern on Tuesday, May 4, 2010 - 10:16 am. (5 messages)

Next thread: [PATCH] Disable i8042 checks on Intel Apple Macs by Bastien Nocera on Tuesday, May 4, 2010 - 10:36 am. (5 messages)
[view original message]
From: Steven Rostedt
Subject: [PATCH][GIT PULL] ring-buffer: Wrap open-coded WARN_ONCE
Date: Tuesday, May 4, 2010 - 10:32 am

Ingo,

Oops, I forgot to add this one too. I just pushed it after you did your
last pull.

Please pull the latest tip/tracing/core tree, which can be found at:

  git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace.git
tip/tracing/core


Borislav Petkov (1):
      ring-buffer: Wrap open-coded WARN_ONCE

----
 kernel/trace/ring_buffer.c |   14 +++++---------
 1 files changed, 5 insertions(+), 9 deletions(-)
---------------------------
commit 956097912c40a03bf22603a3be73503fd9ea9e44
Author: Borislav Petkov <bp@alien8.de>
Date:   Sun May 2 08:03:54 2010 +0200

    ring-buffer: Wrap open-coded WARN_ONCE
    
    Wrap open-coded WARN_ONCE functionality into the equivalent macro.
    
    Signed-off-by: Borislav Petkov <bp@alien8.de>
    LKML-Reference: <20100502060354.GA5281@liondog.tnic>
    Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
index 2a09044..7f6059c 100644
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
@@ -2000,17 +2000,13 @@ rb_add_time_stamp(struct ring_buffer_per_cpu *cpu_buffer,
 		  u64 *ts, u64 *delta)
 {
 	struct ring_buffer_event *event;
-	static int once;
 	int ret;
 
-	if (unlikely(*delta > (1ULL << 59) && !once++)) {
-		printk(KERN_WARNING "Delta way too big! %llu"
-		       " ts=%llu write stamp = %llu\n",
-		       (unsigned long long)*delta,
-		       (unsigned long long)*ts,
-		       (unsigned long long)cpu_buffer->write_stamp);
-		WARN_ON(1);
-	}
+	WARN_ONCE(*delta > (1ULL << 59),
+		  KERN_WARNING "Delta way too big! %llu ts=%llu write stamp = %llu\n",
+		  (unsigned long long)*delta,
+		  (unsigned long long)*ts,
+		  (unsigned long long)cpu_buffer->write_stamp);
 
 	/*
 	 * The delta is too big, we to add a


--


[ message continues ]
[view original message]
From: Ingo Molnar
Subject: Re: [PATCH][GIT PULL] ring-buffer: Wrap open-coded WARN_ONCE
Date: Tuesday, May 4, 2010 - 10:58 am

Pulled, thanks Steve!

	Ingo
--


[ message continues ]
Previous thread: Re: [linux-pm] [PATCH 1/8] PM: Add suspend block api. by Alan Stern on Tuesday, May 4, 2010 - 10:16 am. (5 messages)

Next thread: [PATCH] Disable i8042 checks on Intel Apple Macs by Bastien Nocera on Tuesday, May 4, 2010 - 10:36 am. (5 messages)