From 4f7885b40cc8d0be6e80047bb0c0e0f619a1e56f Mon Sep 17 00:00:00 2001
From: Peter Zijlstra <a.p.zijlstra@chello.nl>
Date: Tue, 10 Mar 2009 19:03:43 +0100
Subject: [PATCH] --- yaml --- r: 140905 b: refs/heads/master c:
 6cc3c6e12bb039047974ad2e7e2d46d15a1b762f h: refs/heads/master i:   140903:
 a6069850686c7eb644d79e70841fb57ab4c42f13 v: v3

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

diff --git a/[refs] b/[refs]
index bb5ee698ed08..7923bfbf5af0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2395037e5dd6841a6fa23afbb31e79d92e549cd1
+refs/heads/master: 6cc3c6e12bb039047974ad2e7e2d46d15a1b762f
diff --git a/trunk/kernel/trace/trace_clock.c b/trunk/kernel/trace/trace_clock.c
index 2d4953f93560..05b176abfd30 100644
--- a/trunk/kernel/trace/trace_clock.c
+++ b/trunk/kernel/trace/trace_clock.c
@@ -27,12 +27,19 @@
  */
 u64 notrace trace_clock_local(void)
 {
+	unsigned long flags;
+	u64 clock;
+
 	/*
 	 * sched_clock() is an architecture implemented, fast, scalable,
 	 * lockless clock. It is not guaranteed to be coherent across
 	 * CPUs, nor across CPU idle events.
 	 */
-	return sched_clock();
+	raw_local_irq_save(flags);
+	clock = sched_clock();
+	raw_local_irq_restore(flags);
+
+	return clock;
 }
 
 /*