aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorMaciej W. Rozycki <macro@linux-mips.org>2008-05-27 16:19:40 -0400
committerIngo Molnar <mingo@elte.hu>2008-07-08 03:13:05 -0400
commit24742ece8eb01b5855059020ba1c09173fd9b732 (patch)
tree14a19933c7b3afd17fe239f01fa31b321deb54b9 /arch
parentf7633ce55b2ea2926a39d7ca9d0bb06c43edd2c2 (diff)
x86: I/O APIC: unmask the second-chance timer interrupt
Unmask the timer interrupt line set up in the through-8259A mode explicitly after setup_timer_IRQ0_pin() has set up the I/O APIC interrupt redirection entry to let the two operations be unbound from each other. Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/io_apic_32.c1
-rw-r--r--arch/x86/kernel/io_apic_64.c1
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 ce682e873aa7..b381f93b79ae 100644
--- a/arch/x86/kernel/io_apic_32.c
+++ b/arch/x86/kernel/io_apic_32.c
@@ -2185,6 +2185,7 @@ static inline void __init check_timer(void)
2185 * legacy devices should be connected to IO APIC #0 2185 * legacy devices should be connected to IO APIC #0
2186 */ 2186 */
2187 setup_timer_IRQ0_pin(apic2, pin2, vector); 2187 setup_timer_IRQ0_pin(apic2, pin2, vector);
2188 unmask_IO_APIC_irq(0);
2188 enable_8259A_irq(0); 2189 enable_8259A_irq(0);
2189 if (timer_irq_works()) { 2190 if (timer_irq_works()) {
2190 printk("works.\n"); 2191 printk("works.\n");
diff --git a/arch/x86/kernel/io_apic_64.c b/arch/x86/kernel/io_apic_64.c
index 6c4635fa97a6..0e20b7d7c1c7 100644
--- a/arch/x86/kernel/io_apic_64.c
+++ b/arch/x86/kernel/io_apic_64.c
@@ -1691,6 +1691,7 @@ static inline void __init check_timer(void)
1691 * legacy devices should be connected to IO APIC #0 1691 * legacy devices should be connected to IO APIC #0
1692 */ 1692 */
1693 setup_timer_IRQ0_pin(apic2, pin2, cfg->vector); 1693 setup_timer_IRQ0_pin(apic2, pin2, cfg->vector);
1694 unmask_IO_APIC_irq(0);
1694 enable_8259A_irq(0); 1695 enable_8259A_irq(0);
1695 if (timer_irq_works()) { 1696 if (timer_irq_works()) {
1696 apic_printk(APIC_VERBOSE," works.\n"); 1697 apic_printk(APIC_VERBOSE," works.\n");