From eb1a5f197bf254834a00b1e0ef8bdd62e88720f8 Mon Sep 17 00:00:00 2001
From: Magnus Damm <magnus@valinux.co.jp>
Date: Sat, 3 Feb 2007 01:13:48 -0800
Subject: [PATCH] --- yaml --- r: 46056 b: refs/heads/master c:
 29a002776ba5ef170446910b1f93c480cdd43706 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/arch/ia64/kernel/irq.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d8d4b84feb91..f2b752d2a140 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dee11c2364f51cac53df17d742a0c69097e29a4e
+refs/heads/master: 29a002776ba5ef170446910b1f93c480cdd43706
diff --git a/trunk/arch/ia64/kernel/irq.c b/trunk/arch/ia64/kernel/irq.c
index 54d55e4d64f7..ce49c85c928f 100644
--- a/trunk/arch/ia64/kernel/irq.c
+++ b/trunk/arch/ia64/kernel/irq.c
@@ -122,6 +122,9 @@ static void migrate_irqs(void)
 	for (irq=0; irq < NR_IRQS; irq++) {
 		desc = irq_desc + irq;
 
+		if (desc->status == IRQ_DISABLED)
+			continue;
+
 		/*
 		 * No handling for now.
 		 * TBD: Implement a disable function so we can now