From a7a9c59e4e610b1a49e66f17ed4602e42cef6c75 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@kernel.org>
Date: Mon, 17 Mar 2008 22:29:32 +0200
Subject: [PATCH] --- yaml --- r: 88875 b: refs/heads/master c:
 ede1389f8ab4f3a1343e567133fa9720a054a3aa h: refs/heads/master i:   88873:
 a916cf154263d3327d6e088f78fbdd3a9f99f810   88871:
 bce2975584997299df79ee1ecb696cf095d53522 v: v3

---
 [refs]                             | 2 +-
 trunk/arch/x86/kernel/io_apic_32.c | 5 -----
 trunk/arch/x86/kernel/mpparse_32.c | 3 +--
 trunk/include/asm-x86/io_apic.h    | 1 -
 4 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 1a15cc740fdb..0b1c4a9bf8f1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6542fe80e6296cde50c1c3b8a9eede701ee51907
+refs/heads/master: ede1389f8ab4f3a1343e567133fa9720a054a3aa
diff --git a/trunk/arch/x86/kernel/io_apic_32.c b/trunk/arch/x86/kernel/io_apic_32.c
index 0d70acd3b134..742fab45e1c6 100644
--- a/trunk/arch/x86/kernel/io_apic_32.c
+++ b/trunk/arch/x86/kernel/io_apic_32.c
@@ -2114,8 +2114,6 @@ static inline void unlock_ExtINT_logic(void)
 	ioapic_write_entry(apic, pin, entry0);
 }
 
-int timer_uses_ioapic_pin_0;
-
 /*
  * This code may look a bit paranoid, but it's supposed to cooperate with
  * a wide range of boards and BIOS bugs.  Fortunately only the timer IRQ
@@ -2155,9 +2153,6 @@ static inline void __init check_timer(void)
 	pin2  = ioapic_i8259.pin;
 	apic2 = ioapic_i8259.apic;
 
-	if (pin1 == 0)
-		timer_uses_ioapic_pin_0 = 1;
-
 	printk(KERN_INFO "..TIMER: vector=0x%02X apic1=%d pin1=%d apic2=%d pin2=%d\n",
 		vector, apic1, pin1, apic2, pin2);
 
diff --git a/trunk/arch/x86/kernel/mpparse_32.c b/trunk/arch/x86/kernel/mpparse_32.c
index 15dd87110298..15265ee11f89 100644
--- a/trunk/arch/x86/kernel/mpparse_32.c
+++ b/trunk/arch/x86/kernel/mpparse_32.c
@@ -1176,8 +1176,7 @@ int mp_register_gsi(u32 gsi, int triggering, int polarity)
 			 * So test for this condition, and if necessary, avoid
 			 * the pin collision.
 			 */
-			if (gsi > 15 || (gsi == 0 && !timer_uses_ioapic_pin_0))
-				gsi = pci_irq++;
+			gsi = pci_irq++;
 			/*
 			 * Don't assign IRQ used by ACPI SCI
 			 */
diff --git a/trunk/include/asm-x86/io_apic.h b/trunk/include/asm-x86/io_apic.h
index 0f5b3fef0b08..095e8e30a345 100644
--- a/trunk/include/asm-x86/io_apic.h
+++ b/trunk/include/asm-x86/io_apic.h
@@ -146,7 +146,6 @@ extern int io_apic_get_version(int ioapic);
 extern int io_apic_get_redir_entries(int ioapic);
 extern int io_apic_set_pci_routing(int ioapic, int pin, int irq,
 				   int edge_level, int active_high_low);
-extern int timer_uses_ioapic_pin_0;
 #endif /* CONFIG_ACPI */
 
 extern int (*ioapic_renumber_irq)(int ioapic, int irq);