git://scm.lunaixsky.com
/
lunaix-os.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into sata-ahci-dev
[lunaix-os.git]
/
lunaix-os
/
kernel
/
asm
/
x86
/
interrupts.c
diff --git
a/lunaix-os/kernel/asm/x86/interrupts.c
b/lunaix-os/kernel/asm/x86/interrupts.c
index a59e5f29a3a083266430976929a86bbab3db250e..864c7da58af3df7f09a292feee299df532474e43 100644
(file)
--- a/
lunaix-os/kernel/asm/x86/interrupts.c
+++ b/
lunaix-os/kernel/asm/x86/interrupts.c
@@
-1,4
+1,5
@@
#include <arch/x86/interrupts.h>
#include <arch/x86/interrupts.h>
+#include <arch/x86/tss.h>
#include <hal/apic.h>
#include <hal/cpu.h>
#include <lunaix/mm/page.h>
#include <hal/apic.h>
#include <hal/cpu.h>
#include <lunaix/mm/page.h>
@@
-41,12
+42,6
@@
intr_handler(isr_param* param)
{
__current->intr_ctx = *param;
{
__current->intr_ctx = *param;
-#ifdef USE_KERNEL_PT
- cpu_lcr3(__kernel_ptd);
-
- vmm_mount_pd(PD_MOUNT_1, __current->page_table);
-#endif
-
isr_param* lparam = &__current->intr_ctx;
if (lparam->vector <= 255) {
isr_param* lparam = &__current->intr_ctx;
if (lparam->vector <= 255) {
@@
-76,8
+71,5
@@
done:
apic_done_servicing();
}
apic_done_servicing();
}
-#ifdef USE_KERNEL_PT
- cpu_lcr3(__current->page_table);
-#endif
return;
}
\ No newline at end of file
return;
}
\ No newline at end of file