From 831dcce061f8b6f231dba3e6dd5b74ac8796b9a1 Mon Sep 17 00:00:00 2001
From: Jay Estabrook <jay.estabrook@hp.com>
Date: Fri, 10 Aug 2007 13:01:12 -0700
Subject: [PATCH] --- yaml --- r: 63871 b: refs/heads/master c:
 f6901e639800e745457b1dcd99c52647981438d7 h: refs/heads/master i:   63869:
 ecb96aba2d50114ec70e57d2e05811b9402df77a   63867:
 d50879ab5251dc196a3558cf576d8372ad83b5d4   63863:
 1c9a33a277ded2f87b742fe4f459617ac4ad88c6   63855:
 5dd038c8596c41f56e0f9ecb2b93448bb1730705   63839:
 8137b6f7ec001038295097cafe181bc671efd491   63807:
 e20f6fecc5466c3be0923e6fa89ec3445d285e67   63743:
 5726296a3307f105c2a5d786c3d95b7c401681d2 v: v3

---
 [refs]                              |  2 +-
 trunk/arch/alpha/kernel/sys_titan.c | 27 ++++++++++++++++++++-------
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index b4dd2a84da2a..6129bf90425b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b1a47190a6000d0e75ee4ffa75f3f6b16dd60a0b
+refs/heads/master: f6901e639800e745457b1dcd99c52647981438d7
diff --git a/trunk/arch/alpha/kernel/sys_titan.c b/trunk/arch/alpha/kernel/sys_titan.c
index 1d3c1398c428..52c91ccc1648 100644
--- a/trunk/arch/alpha/kernel/sys_titan.c
+++ b/trunk/arch/alpha/kernel/sys_titan.c
@@ -270,6 +270,19 @@ titan_dispatch_irqs(u64 mask)
 /*
  * Titan Family
  */
+static void __init
+titan_request_irq(unsigned int irq, irq_handler_t handler,
+		  unsigned long irqflags, const char *devname,
+		  void *dev_id)
+{
+	int err;
+	err = request_irq(irq, handler, irqflags, devname, dev_id);
+	if (err) {
+		printk("titan_request_irq for IRQ %d returned %d; ignoring\n",
+		       irq, err);
+	}
+}
+
 static void __init
 titan_late_init(void)
 {
@@ -278,15 +291,15 @@ titan_late_init(void)
 	 * all reported to the kernel as machine checks, so the handler
 	 * is a nop so it can be called to count the individual events.
 	 */
-	request_irq(63+16, titan_intr_nop, IRQF_DISABLED,
+	titan_request_irq(63+16, titan_intr_nop, IRQF_DISABLED,
 		    "CChip Error", NULL);
-	request_irq(62+16, titan_intr_nop, IRQF_DISABLED,
+	titan_request_irq(62+16, titan_intr_nop, IRQF_DISABLED,
 		    "PChip 0 H_Error", NULL);
-	request_irq(61+16, titan_intr_nop, IRQF_DISABLED,
+	titan_request_irq(61+16, titan_intr_nop, IRQF_DISABLED,
 		    "PChip 1 H_Error", NULL);
-	request_irq(60+16, titan_intr_nop, IRQF_DISABLED,
+	titan_request_irq(60+16, titan_intr_nop, IRQF_DISABLED,
 		    "PChip 0 C_Error", NULL);
-	request_irq(59+16, titan_intr_nop, IRQF_DISABLED,
+	titan_request_irq(59+16, titan_intr_nop, IRQF_DISABLED,
 		    "PChip 1 C_Error", NULL);
 
 	/* 
@@ -345,9 +358,9 @@ privateer_init_pci(void)
 	 * Hook a couple of extra err interrupts that the
 	 * common titan code won't.
 	 */
-	request_irq(53+16, titan_intr_nop, IRQF_DISABLED,
+	titan_request_irq(53+16, titan_intr_nop, IRQF_DISABLED,
 		    "NMI", NULL);
-	request_irq(50+16, titan_intr_nop, IRQF_DISABLED,
+	titan_request_irq(50+16, titan_intr_nop, IRQF_DISABLED,
 		    "Temperature Warning", NULL);
 
 	/*