From 064461b1a98f2f890de1c30a1de04974104fb1f3 Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 6 Aug 2009 16:02:50 -0700
Subject: [PATCH] --- yaml --- r: 158341 b: refs/heads/master c:
 8e5b59a2d728e6963b35dba8bb36e0b70267462e h: refs/heads/master i:   158339:
 a78d32838cd63651f26e5e33707a144da5fe1f18 v: v3

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

diff --git a/[refs] b/[refs]
index 2d1af55984e7..544e6b3c28de 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bcf08df3b23b3d13bf8c4ad6bd744a6ad30015fb
+refs/heads/master: 8e5b59a2d728e6963b35dba8bb36e0b70267462e
diff --git a/trunk/include/linux/hardirq.h b/trunk/include/linux/hardirq.h
index 8246c697863d..0d885fd75111 100644
--- a/trunk/include/linux/hardirq.h
+++ b/trunk/include/linux/hardirq.h
@@ -64,6 +64,12 @@
 #define HARDIRQ_OFFSET	(1UL << HARDIRQ_SHIFT)
 #define NMI_OFFSET	(1UL << NMI_SHIFT)
 
+#ifndef PREEMPT_ACTIVE
+#define PREEMPT_ACTIVE_BITS	1
+#define PREEMPT_ACTIVE_SHIFT	(NMI_SHIFT + NMI_BITS)
+#define PREEMPT_ACTIVE	(__IRQ_MASK(PREEMPT_ACTIVE_BITS) << PREEMPT_ACTIVE_SHIFT)
+#endif
+
 #if PREEMPT_ACTIVE < (1 << (NMI_SHIFT + NMI_BITS))
 #error PREEMPT_ACTIVE is too low!
 #endif