---

yaml --- r: 140905 b: refs/heads/master c: 6cc3c6e h: refs/heads/master i: 140903: a606985 v: v3
git-mirror · Mar 10, 2009 · 4f7885b · 4f7885b
1 parent ff23034
commit 4f7885b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git 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
@@ -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;
 }
 
 /*