From fca6194fdd8a58b4ea3082afef1e5301e9486fe0 Mon Sep 17 00:00:00 2001
From: Joe Jin <joe.jin@oracle.com>
Date: Fri, 7 Jan 2011 14:50:12 +0800
Subject: [PATCH] --- yaml --- r: 227701 b: refs/heads/master c:
 110e7c7e4f8a61a34e0ab88fc9bdf4d5c6d220b2 h: refs/heads/master i:   227699:
 4656abd72443281ea7a93e0fbe91c32797ff3681 v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/xen/events.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 5f4f974d75a9..fb2c2c41cb2a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fc550e95921e109f3778a6b2dc560d63388810ab
+refs/heads/master: 110e7c7e4f8a61a34e0ab88fc9bdf4d5c6d220b2
diff --git a/trunk/drivers/xen/events.c b/trunk/drivers/xen/events.c
index 4d4a23d4c9f6..3df7e477694a 100644
--- a/trunk/drivers/xen/events.c
+++ b/trunk/drivers/xen/events.c
@@ -170,6 +170,9 @@ static struct irq_info *info_for_irq(unsigned irq)
 
 static unsigned int evtchn_from_irq(unsigned irq)
 {
+	if (unlikely(WARN(irq < 0 || irq >= nr_irqs, "Invalid irq %d!\n", irq)))
+		return 0;
+
 	return info_for_irq(irq)->evtchn;
 }