Commit ede1389f authored by Adrian Bunk's avatar Adrian Bunk Committed by Ingo Molnar

x86: remove the write-only timer_uses_ioapic_pin_0

This patch removes the write-only timer_uses_ioapic_pin_0
(gsi can't be <= 15 in the line of it's fake usage in mpparse_32.c).

Spotted by the GNU C compiler.
Signed-off-by: default avatarAdrian Bunk <bunk@kernel.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 6542fe80
...@@ -2114,8 +2114,6 @@ static inline void unlock_ExtINT_logic(void) ...@@ -2114,8 +2114,6 @@ static inline void unlock_ExtINT_logic(void)
ioapic_write_entry(apic, pin, entry0); 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 * 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 * a wide range of boards and BIOS bugs. Fortunately only the timer IRQ
...@@ -2155,9 +2153,6 @@ static inline void __init check_timer(void) ...@@ -2155,9 +2153,6 @@ static inline void __init check_timer(void)
pin2 = ioapic_i8259.pin; pin2 = ioapic_i8259.pin;
apic2 = ioapic_i8259.apic; 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", printk(KERN_INFO "..TIMER: vector=0x%02X apic1=%d pin1=%d apic2=%d pin2=%d\n",
vector, apic1, pin1, apic2, pin2); vector, apic1, pin1, apic2, pin2);
......
...@@ -1176,8 +1176,7 @@ int mp_register_gsi(u32 gsi, int triggering, int polarity) ...@@ -1176,8 +1176,7 @@ int mp_register_gsi(u32 gsi, int triggering, int polarity)
* So test for this condition, and if necessary, avoid * So test for this condition, and if necessary, avoid
* the pin collision. * 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 * Don't assign IRQ used by ACPI SCI
*/ */
......
...@@ -146,7 +146,6 @@ extern int io_apic_get_version(int ioapic); ...@@ -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_get_redir_entries(int ioapic);
extern int io_apic_set_pci_routing(int ioapic, int pin, int irq, extern int io_apic_set_pci_routing(int ioapic, int pin, int irq,
int edge_level, int active_high_low); int edge_level, int active_high_low);
extern int timer_uses_ioapic_pin_0;
#endif /* CONFIG_ACPI */ #endif /* CONFIG_ACPI */
extern int (*ioapic_renumber_irq)(int ioapic, int irq); extern int (*ioapic_renumber_irq)(int ioapic, int irq);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment