From f804fc1b95e8cca46f57d34b2674a3ecb96da66b Mon Sep 17 00:00:00 2001
From: Pekka Enberg <penberg@cs.helsinki.fi>
Date: Thu, 9 Apr 2009 11:52:24 +0300
Subject: [PATCH] --- yaml --- r: 145592 b: refs/heads/master c:
 598c73d250ffb112715aa48fb325d79e255be23b h: refs/heads/master v: v3

---
 [refs]                             |  2 +-
 trunk/arch/x86/kernel/irqinit_32.c |  2 +-
 trunk/arch/x86/kernel/irqinit_64.c | 10 ++++++----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 88456099c4a3..fbb643bc90af 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b0096bb0b640d0a7713618b3472fd0f4adf30a96
+refs/heads/master: 598c73d250ffb112715aa48fb325d79e255be23b
diff --git a/trunk/arch/x86/kernel/irqinit_32.c b/trunk/arch/x86/kernel/irqinit_32.c
index ef2528d298b6..4488b713396e 100644
--- a/trunk/arch/x86/kernel/irqinit_32.c
+++ b/trunk/arch/x86/kernel/irqinit_32.c
@@ -98,7 +98,7 @@ static void __init init_ISA_irqs(void)
 {
 	int i;
 
-#ifdef CONFIG_X86_LOCAL_APIC
+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_LOCAL_APIC)
 	init_bsp_APIC();
 #endif
 	init_8259A(0);
diff --git a/trunk/arch/x86/kernel/irqinit_64.c b/trunk/arch/x86/kernel/irqinit_64.c
index 9e7c57dc79e6..61c9a922e80c 100644
--- a/trunk/arch/x86/kernel/irqinit_64.c
+++ b/trunk/arch/x86/kernel/irqinit_64.c
@@ -84,9 +84,14 @@ static void __init init_ISA_irqs(void)
 {
 	int i;
 
+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_LOCAL_APIC)
 	init_bsp_APIC();
+#endif
 	init_8259A(0);
 
+	/*
+	 * 16 old-style INTA-cycle interrupts:
+	 */
 	for (i = 0; i < NR_IRQS_LEGACY; i++) {
 		struct irq_desc *desc = irq_to_desc(i);
 
@@ -94,11 +99,8 @@ static void __init init_ISA_irqs(void)
 		desc->action = NULL;
 		desc->depth = 1;
 
-		/*
-		 * 16 old-style INTA-cycle interrupts:
-		 */
 		set_irq_chip_and_handler_name(i, &i8259A_chip,
-						      handle_level_irq, "XT");
+					      handle_level_irq, "XT");
 	}
 }