Commit ed1d77b18c9f4ff06d5b42c65041aa55a1447053

Authored by Linus Torvalds
1 parent fb3ff69d13

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>

Showing 1 changed file with 1 additions and 0 deletions Side-by-side Diff

include/linux/hardirq.h
... ... @@ -94,6 +94,7 @@
94 94 #define in_nmi() (preempt_count() & NMI_MASK)
95 95  
96 96 #if defined(CONFIG_PREEMPT) && defined(CONFIG_BKL)
  97 +# include <linux/sched.h>
97 98 # define PREEMPT_INATOMIC_BASE (current->lock_depth >= 0)
98 99 #else
99 100 # define PREEMPT_INATOMIC_BASE 0