From c9a03d29a2f8cb953e913b2bd286a312949aa9ec Mon Sep 17 00:00:00 2001
From: Steven Rostedt <rostedt@goodmis.org>
Date: Wed, 12 Nov 2008 00:01:27 -0500
Subject: [PATCH] --- yaml --- r: 119155 b: refs/heads/master c:
 47e74f2ba8fbf9fb1378e2524e6cfdc2fb37f160 h: refs/heads/master i:   119153:
 474fe13ed08ea7d5a9595800a40fb732a94a65ba   119151:
 4a0fbd63c8261b8655b9c0189b55d33da7788a40 v: v3

---
 [refs]                           | 2 +-
 trunk/kernel/trace/ring_buffer.c | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7ec06b9ee9ba..0732cd8fc11d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c1e7abbc7afc97367cd77c8f2895c2169a8f9c87
+refs/heads/master: 47e74f2ba8fbf9fb1378e2524e6cfdc2fb37f160
diff --git a/trunk/kernel/trace/ring_buffer.c b/trunk/kernel/trace/ring_buffer.c
index b08ee9f00c8d..231db209fa82 100644
--- a/trunk/kernel/trace/ring_buffer.c
+++ b/trunk/kernel/trace/ring_buffer.c
@@ -51,8 +51,14 @@ void tracing_off(void)
 /* FIXME!!! */
 u64 ring_buffer_time_stamp(int cpu)
 {
+	u64 time;
+
+	preempt_disable_notrace();
 	/* shift to debug/test normalization and TIME_EXTENTS */
-	return sched_clock() << DEBUG_SHIFT;
+	time = sched_clock() << DEBUG_SHIFT;
+	preempt_enable_notrace();
+
+	return time;
 }
 
 void ring_buffer_normalize_time_stamp(int cpu, u64 *ts)