summaryrefslogtreecommitdiff
path: root/kernel/trap.c
diff options
context:
space:
mode:
authorFrans Kaashoek <[email protected]>2019-07-23 07:30:23 -0400
committerFrans Kaashoek <[email protected]>2019-07-23 07:30:23 -0400
commitb8a31c494cb535d9eb3e4c1971c4c9020c27c239 (patch)
tree37e0194f63d716661201c1d8b5ef3f2d7b2e0f3a /kernel/trap.c
parent6c78af4a577aa88cc499ea777556a4a16dd4a7fe (diff)
downloadxv6-labs-b8a31c494cb535d9eb3e4c1971c4c9020c27c239.tar.gz
xv6-labs-b8a31c494cb535d9eb3e4c1971c4c9020c27c239.tar.bz2
xv6-labs-b8a31c494cb535d9eb3e4c1971c4c9020c27c239.zip
one more TRAMPOLINE
Diffstat (limited to 'kernel/trap.c')
-rw-r--r--kernel/trap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trap.c b/kernel/trap.c
index ea5799f..1af7c00 100644
--- a/kernel/trap.c
+++ b/kernel/trap.c
@@ -123,7 +123,7 @@ usertrapret(void)
// jump to trampoline.S at the top of memory, which
// switches to the user page table, restores user registers,
// and switches to user mode with sret.
- ((void (*)(uint64,uint64))TRAMPOLINE)(TRAMPOLINE - PGSIZE, satp);
+ ((void (*)(uint64,uint64))TRAMPOLINE)(TRAPFRAME, satp);
}
// interrupts and exceptions from kernel code go here via kernelvec,