summaryrefslogtreecommitdiff
path: root/arch/x86/machine
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/machine')
-rw-r--r--arch/x86/machine/lapic.c4
-rw-r--r--arch/x86/machine/trap.c3
2 files changed, 1 insertions, 6 deletions
diff --git a/arch/x86/machine/lapic.c b/arch/x86/machine/lapic.c
index e65d5a3b..10d6b40e 100644
--- a/arch/x86/machine/lapic.c
+++ b/arch/x86/machine/lapic.c
@@ -340,10 +340,8 @@ lapic_intr_timer(struct trap_frame *frame)
{
(void)frame;
-#if 0
- thread_tick();
-#endif
lapic_eoi();
+ thread_tick();
}
void
diff --git a/arch/x86/machine/trap.c b/arch/x86/machine/trap.c
index a26212a2..18bff6bc 100644
--- a/arch/x86/machine/trap.c
+++ b/arch/x86/machine/trap.c
@@ -150,10 +150,7 @@ trap_main(struct trap_frame *frame)
{
assert(frame->vector < ARRAY_SIZE(trap_handlers));
trap_handlers[frame->vector].fn(frame);
-
-#if 0
thread_reschedule();
-#endif
}
#ifdef __LP64__