MIPS: SGI-IP27: Only reserve interrupts used in Linux

Reduce number of reserved interrupts by removing bits copied from IRIX
and not used by Linux.

Signed-off-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
Signed-off-by: Paul Burton <paulburton@kernel.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: James Hogan <jhogan@kernel.org>
Cc: linux-mips@vger.kernel.org
Cc: linux-kernel@vger.kernel.org

diff --git a/arch/mips/include/asm/sn/intr.h b/arch/mips/include/asm/sn/intr.h
index fc1348193957a3a7a608fb614a56f07230eef1e3..3d6954d370dc98c06f155994f928c30e5cfa693b 100644 (file)
--- a/arch/mips/include/asm/sn/intr.h
+++ b/arch/mips/include/asm/sn/intr.h
@@ -8,15 +8,6 @@
 #ifndef __ASM_SN_INTR_H
 #define __ASM_SN_INTR_H
 
-/* Number of interrupt levels associated with each interrupt register. */
-#define N_INTPEND_BITS         64
-
-#define INT_PEND0_BASELVL      0
-#define INT_PEND1_BASELVL      64
-
-#define N_INTPENDJUNK_BITS     8
-#define INTPENDJUNK_CLRBIT     0x80
-
 /*
  * Macros to manipulate the interrupt register on the calling hub chip.
  */
@@ -84,14 +75,6 @@ do {                                                         \
 #define CPU_RESCHED_B_IRQ       8
 #define CPU_CALL_A_IRQ          9
 #define CPU_CALL_B_IRQ         10
-#define MSC_MESG_INTR          11
-#define BASE_PCI_IRQ           12
-
-/*
- * INT_PEND0 again, bits determined by hardware / hardcoded:
- */
-#define SDISK_INTR             63      /* SABLE name */
-#define IP_PEND0_6_63          63      /* What is this bit? */
 
 /*
  * INT_PEND1 hard-coded bits:

diff --git a/arch/mips/sgi-ip27/ip27-irq.c b/arch/mips/sgi-ip27/ip27-irq.c
index 5a4a782ceae5ac8cdaf041acabe44ca73fd5a6b6..42df9fafa943ecfbe807a807b05cfbc73a0333c1 100644 (file)
--- a/arch/mips/sgi-ip27/ip27-irq.c
+++ b/arch/mips/sgi-ip27/ip27-irq.c
@@ -287,11 +287,9 @@ void __init arch_init_irq(void)
         * Mark these as reserved right away so they won't be used accidentally
         * later.
         */
-       for (i = 0; i <= BASE_PCI_IRQ; i++)
+       for (i = 0; i <= CPU_CALL_B_IRQ; i++)
                set_bit(i, hub_irq_map);
 
-       set_bit(IP_PEND0_6_63, hub_irq_map);
-
        for (i = NI_BRDCAST_ERR_A; i <= MSC_PANIC_INTR; i++)
                set_bit(i, hub_irq_map);