From: Linus Torvalds <torvalds@home.transmeta.com>
Date: Wed, 24 Jul 2002 03:29:54 +0000 (-0700)
Subject: Fix up irqlock removal patch, avoid compiler warnings
X-Git-Tag: v2.5.28~8^2~6^2~4
X-Git-Url: http://git.neil.brown.name/?a=commitdiff_plain;h=7e9b34abc7a01c816ac0b4f4bcc26b2df6a2b1e2;p=history.git

Fix up irqlock removal patch, avoid compiler warnings
---

diff --git a/arch/i386/kernel/bluesmoke.c b/arch/i386/kernel/bluesmoke.c
index f2a9920996a8..e57644c66229 100644
--- 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 5629c508f99a..54a07d52e593 100644
--- 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