aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/mips/sgi-ip27/ip27-irq.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/arch/mips/sgi-ip27/ip27-irq.c b/arch/mips/sgi-ip27/ip27-irq.c
index d3b64f7c1d52..73e5e52781d8 100644
--- a/arch/mips/sgi-ip27/ip27-irq.c
+++ b/arch/mips/sgi-ip27/ip27-irq.c
@@ -5,6 +5,9 @@
5 * Copyright (C) 1999, 2000 Silicon Graphics, Inc. 5 * Copyright (C) 1999, 2000 Silicon Graphics, Inc.
6 * Copyright (C) 1999 - 2001 Kanoj Sarcar 6 * Copyright (C) 1999 - 2001 Kanoj Sarcar
7 */ 7 */
8
9#undef DEBUG
10
8#include <linux/config.h> 11#include <linux/config.h>
9#include <linux/init.h> 12#include <linux/init.h>
10#include <linux/irq.h> 13#include <linux/irq.h>
@@ -18,6 +21,7 @@
18#include <linux/slab.h> 21#include <linux/slab.h>
19#include <linux/random.h> 22#include <linux/random.h>
20#include <linux/smp_lock.h> 23#include <linux/smp_lock.h>
24#include <linux/kernel.h>
21#include <linux/kernel_stat.h> 25#include <linux/kernel_stat.h>
22#include <linux/delay.h> 26#include <linux/delay.h>
23#include <linux/bitops.h> 27#include <linux/bitops.h>
@@ -36,13 +40,6 @@
36#include <asm/sn/hub.h> 40#include <asm/sn/hub.h>
37#include <asm/sn/intr.h> 41#include <asm/sn/intr.h>
38 42
39#undef DEBUG_IRQ
40#ifdef DEBUG_IRQ
41#define DBG(x...) printk(x)
42#else
43#define DBG(x...)
44#endif
45
46/* 43/*
47 * Linux has a controller-independent x86 interrupt architecture. 44 * Linux has a controller-independent x86 interrupt architecture.
48 * every controller has a 'controller-template', that is used 45 * every controller has a 'controller-template', that is used
@@ -264,7 +261,7 @@ static unsigned int startup_bridge_irq(unsigned int irq)
264 bc = IRQ_TO_BRIDGE(irq); 261 bc = IRQ_TO_BRIDGE(irq);
265 bridge = bc->base; 262 bridge = bc->base;
266 263
267 DBG("bridge_startup(): irq= 0x%x pin=%d\n", irq, pin); 264 pr_debug("bridge_startup(): irq= 0x%x pin=%d\n", irq, pin);
268 /* 265 /*
269 * "map" irq to a swlevel greater than 6 since the first 6 bits 266 * "map" irq to a swlevel greater than 6 since the first 6 bits
270 * of INT_PEND0 are taken 267 * of INT_PEND0 are taken
@@ -307,7 +304,7 @@ static void shutdown_bridge_irq(unsigned int irq)
307 int pin, swlevel; 304 int pin, swlevel;
308 cpuid_t cpu; 305 cpuid_t cpu;
309 306
310 DBG("bridge_shutdown: irq 0x%x\n", irq); 307 pr_debug("bridge_shutdown: irq 0x%x\n", irq);
311 pin = SLOT_FROM_PCI_IRQ(irq); 308 pin = SLOT_FROM_PCI_IRQ(irq);
312 309
313 /* 310 /*