aboutsummaryrefslogtreecommitdiff
path: root/linux
diff options
context:
space:
mode:
authorDamien Zammit <damien@zamaudio.com>2023-02-03 10:01:55 +0000
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2023-02-03 20:12:18 +0100
commit03e012dbe6e340fe1c6665b691a9145f05d0e997 (patch)
tree7001a90af766fe2e93731f606501b9c88b40db05 /linux
parente09a4974ddc43ec10f0a940c08cc79e4778dfc49 (diff)
downloadgnumach-03e012dbe6e340fe1c6665b691a9145f05d0e997.tar.gz
gnumach-03e012dbe6e340fe1c6665b691a9145f05d0e997.tar.bz2
gnumach-03e012dbe6e340fe1c6665b691a9145f05d0e997.zip
linux: Keep existing timer interrupt handler for APIC
Message-Id: <20230203100133.835589-2-damien@zamaudio.com>
Diffstat (limited to 'linux')
-rw-r--r--linux/dev/arch/i386/kernel/irq.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/linux/dev/arch/i386/kernel/irq.c b/linux/dev/arch/i386/kernel/irq.c
index 67feea84..c10888e3 100644
--- a/linux/dev/arch/i386/kernel/irq.c
+++ b/linux/dev/arch/i386/kernel/irq.c
@@ -721,13 +721,13 @@ init_IRQ (void)
outb_p (PIT_C0 | PIT_SQUAREMODE | PIT_READMODE, PITCTL_PORT);
outb_p (latch & 0xff, PITCTR0_PORT);
outb (latch >> 8, PITCTR0_PORT);
-#endif
/*
* Install our clock interrupt handler.
*/
old_clock_handler = ivect[0];
ivect[0] = linux_timer_intr;
+#endif
reserve_mach_irqs ();
@@ -764,9 +764,11 @@ restore_IRQ (void)
*/
(void) splhigh ();
+#ifndef APIC
/*
* Restore clock interrupt handler.
*/
ivect[0] = old_clock_handler;
+#endif
}