aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/hardirq.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-11-18 10:56:29 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-11-18 10:56:29 -0800
commited1d77b18c9f4ff06d5b42c65041aa55a1447053 (patch)
tree9356285fc858fa6b60af7e99e827c129a696f6c6 /include/linux/hardirq.h
parentfb3ff69d1397ce4bd2441c87b1daea67cb945ac6 (diff)
downloadmrst-s0i3-test-ed1d77b18c9f4ff06d5b42c65041aa55a1447053.tar.gz
mrst-s0i3-test-ed1d77b18c9f4ff06d5b42c65041aa55a1447053.tar.xz
mrst-s0i3-test-ed1d77b18c9f4ff06d5b42c65041aa55a1447053.zip
hardirq.h: needs sched.h if using BKL
This really isn't the right thing to do, and strictly speaking we should have the BKL depth count in the thread info right next to the preempt count. The two really do go together. However, since that would involve a patch to all architectures, and the BKL is finally going away, it's simply not worth the effort to do the RightThing(tm). Just re-instate the <linux/sched.h> include that we used to get accidentally from the smp_lock.h one. This is all fallout from the same old "BKL: remove extraneous #include <smp_lock.h>" commit. Reported-by: Ingo Molnar <mingo@elte.hu> Tested-by: Randy Dunlap <randy.dunlap@oracle.com> Cc: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux/hardirq.h')
-rw-r--r--include/linux/hardirq.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/hardirq.h b/include/linux/hardirq.h
index 714da7e5d10..32f9fd6619b 100644
--- a/include/linux/hardirq.h
+++ b/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