From 4ee6768eeeb4fb421803674851f5e16746bac682 Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 28 Oct 2010 16:12:33 +0200
Subject: [PATCH] --- yaml --- r: 221542 b: refs/heads/master c:
 7fe19da4ca38fc20cdbc7020fcf2eca8fc756410 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/include/linux/hardirq.h | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index a27a224aacc5..7547aa319dd9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 020e773f6b2e797a13d23723773ed1b3ba2c35dc
+refs/heads/master: 7fe19da4ca38fc20cdbc7020fcf2eca8fc756410
diff --git a/trunk/include/linux/hardirq.h b/trunk/include/linux/hardirq.h
index 8a389b608ce3..41cb31f14ee3 100644
--- a/trunk/include/linux/hardirq.h
+++ b/trunk/include/linux/hardirq.h
@@ -96,11 +96,15 @@
  */
 #define in_nmi()	(preempt_count() & NMI_MASK)
 
-#if defined(CONFIG_PREEMPT)
+#if defined(CONFIG_PREEMPT) && defined(CONFIG_BKL)
 # define PREEMPT_INATOMIC_BASE kernel_locked()
-# define PREEMPT_CHECK_OFFSET 1
 #else
 # define PREEMPT_INATOMIC_BASE 0
+#endif
+
+#if defined(CONFIG_PREEMPT)
+# define PREEMPT_CHECK_OFFSET 1
+#else
 # define PREEMPT_CHECK_OFFSET 0
 #endif