From aa7520f23a61a2c39ce3b71573ea0f3a7be81878 Mon Sep 17 00:00:00 2001
From: Mike Travis <travis@sgi.com>
Date: Sat, 10 Jan 2009 22:24:06 -0800
Subject: [PATCH] --- yaml --- r: 136380 b: refs/heads/master c:
 e2f4d06545ec1f29b0e838ee34cbf3500ea5b9a4 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/kernel/irq/handle.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index a5dd47eb956e..96816cf4c90f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9594949b060efe86ecaa1a66839232a3b9800bc9
+refs/heads/master: e2f4d06545ec1f29b0e838ee34cbf3500ea5b9a4
diff --git a/trunk/kernel/irq/handle.c b/trunk/kernel/irq/handle.c
index 790c5fa7ea39..fd1ef16252f4 100644
--- a/trunk/kernel/irq/handle.c
+++ b/trunk/kernel/irq/handle.c
@@ -163,9 +163,8 @@ struct irq_desc *irq_to_desc_alloc_cpu(unsigned int irq, int cpu)
 	int node;
 
 	if (irq >= nr_irqs) {
-		printk(KERN_WARNING "irq >= nr_irqs in irq_to_desc_alloc: %d %d\n",
-				irq, nr_irqs);
-		WARN_ON(1);
+		WARN(1, "irq (%d) >= nr_irqs (%d) in irq_to_desc_alloc\n",
+			irq, nr_irqs);
 		return NULL;
 	}