diff options
-rw-r--r-- | arch/x86/kernel/io_apic_32.c | 1 | ||||
-rw-r--r-- | arch/x86/kernel/io_apic_64.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kernel/io_apic_32.c b/arch/x86/kernel/io_apic_32.c index 61cf366d040f..e7b7655c4e94 100644 --- a/arch/x86/kernel/io_apic_32.c +++ b/arch/x86/kernel/io_apic_32.c | |||
@@ -2228,6 +2228,7 @@ static inline void __init check_timer(void) | |||
2228 | printk(" works.\n"); | 2228 | printk(" works.\n"); |
2229 | goto out; | 2229 | goto out; |
2230 | } | 2230 | } |
2231 | disable_8259A_irq(0); | ||
2231 | apic_write_around(APIC_LVT0, APIC_LVT_MASKED | APIC_DM_FIXED | vector); | 2232 | apic_write_around(APIC_LVT0, APIC_LVT_MASKED | APIC_DM_FIXED | vector); |
2232 | printk(" failed.\n"); | 2233 | printk(" failed.\n"); |
2233 | 2234 | ||
diff --git a/arch/x86/kernel/io_apic_64.c b/arch/x86/kernel/io_apic_64.c index 9f16ca4b5a24..6433fc99f1f9 100644 --- a/arch/x86/kernel/io_apic_64.c +++ b/arch/x86/kernel/io_apic_64.c | |||
@@ -1729,6 +1729,7 @@ static inline void __init check_timer(void) | |||
1729 | apic_printk(APIC_VERBOSE," works.\n"); | 1729 | apic_printk(APIC_VERBOSE," works.\n"); |
1730 | goto out; | 1730 | goto out; |
1731 | } | 1731 | } |
1732 | disable_8259A_irq(0); | ||
1732 | apic_write(APIC_LVT0, APIC_LVT_MASKED | APIC_DM_FIXED | cfg->vector); | 1733 | apic_write(APIC_LVT0, APIC_LVT_MASKED | APIC_DM_FIXED | cfg->vector); |
1733 | apic_printk(APIC_VERBOSE," failed.\n"); | 1734 | apic_printk(APIC_VERBOSE," failed.\n"); |
1734 | 1735 | ||