From 25702ffeab7c1ca3266293c5586223730b61a486 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 18 Nov 2010 10:56:29 -0800
Subject: [PATCH] --- yaml --- r: 222205 b: refs/heads/master c:
 ed1d77b18c9f4ff06d5b42c65041aa55a1447053 h: refs/heads/master i:   222203:
 e2ff9112deb069f8fc5ce6c5af589317dd447683 v: v3

---
 [refs]                        | 2 +-
 trunk/include/linux/hardirq.h | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 004aae2cd032..b6ffbc433cca 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fb3ff69d1397ce4bd2441c87b1daea67cb945ac6
+refs/heads/master: ed1d77b18c9f4ff06d5b42c65041aa55a1447053
diff --git a/trunk/include/linux/hardirq.h b/trunk/include/linux/hardirq.h
index 714da7e5d10c..32f9fd6619b4 100644
--- a/trunk/include/linux/hardirq.h
+++ b/trunk/include/linux/hardirq.h
@@ -94,6 +94,7 @@
 #define in_nmi()	(preempt_count() & NMI_MASK)
 
 #if defined(CONFIG_PREEMPT) && defined(CONFIG_BKL)
+# include <linux/sched.h>
 # define PREEMPT_INATOMIC_BASE (current->lock_depth >= 0)
 #else
 # define PREEMPT_INATOMIC_BASE 0