aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/io_apic_64.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/kernel/io_apic_64.c')
-rw-r--r--arch/x86/kernel/io_apic_64.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kernel/io_apic_64.c b/arch/x86/kernel/io_apic_64.c
index aa45a85c4d1..2a60bfb7446 100644
--- a/arch/x86/kernel/io_apic_64.c
+++ b/arch/x86/kernel/io_apic_64.c
@@ -90,6 +90,7 @@ static int no_timer_check;
90 90
91static int disable_timer_pin_1 __initdata; 91static int disable_timer_pin_1 __initdata;
92 92
93int timer_through_8259 __initdata;
93 94
94/* Where if anywhere is the i8259 connect in external int mode */ 95/* Where if anywhere is the i8259 connect in external int mode */
95static struct { int pin, apic; } ioapic_i8259 = { -1, -1 }; 96static struct { int pin, apic; } ioapic_i8259 = { -1, -1 };
@@ -1700,6 +1701,7 @@ static inline void __init check_timer(void)
1700 enable_8259A_irq(0); 1701 enable_8259A_irq(0);
1701 if (timer_irq_works()) { 1702 if (timer_irq_works()) {
1702 apic_printk(APIC_VERBOSE," works.\n"); 1703 apic_printk(APIC_VERBOSE," works.\n");
1704 timer_through_8259 = 1;
1703 nmi_watchdog_default(); 1705 nmi_watchdog_default();
1704 if (nmi_watchdog == NMI_IO_APIC) { 1706 if (nmi_watchdog == NMI_IO_APIC) {
1705 disable_8259A_irq(0); 1707 disable_8259A_irq(0);