Fix up irqlock removal patch, avoid compiler warnings

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>

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