Fix up irqlock removal patch, avoid compiler warnings

diff --git a/arch/i386/kernel/bluesmoke.c b/arch/i386/kernel/bluesmoke.c
index f2a9920996a826ceadd96535655ac35150a6c387..e57644c66229448ba4a8816084d98b72b3d6afa8 100644 (file)
--- a/arch/i386/kernel/bluesmoke.c
+++ b/arch/i386/kernel/bluesmoke.c
@@ -10,6 +10,7 @@
 #include <linux/config.h>
 #include <linux/irq.h>
 #include <linux/tqueue.h>
+#include <linux/interrupt.h>
 
 #include <asm/processor.h> 
 #include <asm/system.h>

diff --git a/include/asm-i386/hardirq.h b/include/asm-i386/hardirq.h
index 5629c508f99afd3bb589b70a72d0d1210d281960..54a07d52e593d72113093d15d4e2643322746acd 100644 (file)
--- a/include/asm-i386/hardirq.h
+++ b/include/asm-i386/hardirq.h
@@ -29,7 +29,6 @@ typedef struct {
  * PREEMPT_MASK: 0x000000ff
  * HARDIRQ_MASK: 0x0000ff00
  * SOFTIRQ_MASK: 0x00ff0000
- * IRQ_MASK:     0x00ffff00
  */
 
 #define PREEMPT_BITS   8
@@ -54,8 +53,6 @@ typedef struct {
 #define SOFTIRQ_OFFSET (1UL << SOFTIRQ_SHIFT)
 #define HARDIRQ_OFFSET (1UL << HARDIRQ_SHIFT)
 
-#define IRQ_MASK       (HARDIRQ_MASK | SOFTIRQ_MASK)
-
 /*
  * The hardirq mask has to be large enough to have
  * space for potentially all IRQ sources in the system