From 6c241be7ccac58999dc678f197fcaa1e8b77362b Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Thu, 4 Mar 2010 11:51:29 +0100
Subject: [PATCH] --- yaml --- r: 187863 b: refs/heads/master c:
 e02c4fd3142dfb9412531bbfabd510a2a7c6ea46 h: refs/heads/master i:   187861:
 47682aa5b3ed1f4edbd432d2fcac9f4d56713cdf   187859:
 ddfaa7a3827b8321fa2409bdb14bf66a4d8bdc2c   187855:
 b0a7f066569d2eeba7924dc586985c39704e3015 v: v3

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

diff --git a/[refs] b/[refs]
index b5fa27be176d..843cd1e6656c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ac91d85456372a90af5b85eb6620fd2efb1e431b
+refs/heads/master: e02c4fd3142dfb9412531bbfabd510a2a7c6ea46
diff --git a/trunk/kernel/trace/trace_clock.c b/trunk/kernel/trace/trace_clock.c
index 84a3a7ba072a..6fbfb8f417b9 100644
--- a/trunk/kernel/trace/trace_clock.c
+++ b/trunk/kernel/trace/trace_clock.c
@@ -13,6 +13,7 @@
  * Tracer plugins will chose a default from these clocks.
  */
 #include <linux/spinlock.h>
+#include <linux/irqflags.h>
 #include <linux/hardirq.h>
 #include <linux/module.h>
 #include <linux/percpu.h>