"kernel_locked()" needs <linux/smp_lock.h>.

So make sure to include it in <asm-i386/hardirq.h> when needed
(ie for the CONFIG_PREEMPT case).

diff --git a/include/asm-i386/hardirq.h b/include/asm-i386/hardirq.h
index 5a14545af1791b0bf1b689cc0343ebc1080252ee..52fe4d99308526b9bfca9ecc231c7724616bad4c 100644 (file)
--- a/include/asm-i386/hardirq.h
+++ b/include/asm-i386/hardirq.h
@@ -77,6 +77,7 @@ typedef struct {
 #define nmi_exit()             (preempt_count() -= HARDIRQ_OFFSET)
 
 #ifdef CONFIG_PREEMPT
+# include <linux/smp_lock.h>
 # define in_atomic()   ((preempt_count() & ~PREEMPT_ACTIVE) != kernel_locked())
 # define IRQ_EXIT_OFFSET (HARDIRQ_OFFSET-1)
 #else