From ea95a6654c3f921849f3541aa856a8806ebf571e Mon Sep 17 00:00:00 2001 From: Robert Morris Date: Fri, 26 Jul 2019 04:53:46 -0400 Subject: trampin -> uservec trampout -> userret --- kernel/proc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'kernel/proc.c') diff --git a/kernel/proc.c b/kernel/proc.c index 48b006f..0dcae00 100644 --- a/kernel/proc.c +++ b/kernel/proc.c @@ -18,7 +18,7 @@ struct spinlock pid_lock; extern void forkret(void); static void wakeup1(struct proc *chan); -extern char trampout[]; // trampoline.S +extern char trampoline[]; // trampoline.S void procinit(void) @@ -159,7 +159,7 @@ proc_pagetable(struct proc *p) // only the supervisor uses it, on the way // to/from user space, so not PTE_U. mappages(pagetable, TRAMPOLINE, PGSIZE, - (uint64)trampout, PTE_R | PTE_X); + (uint64)trampoline, PTE_R | PTE_X); // map the trapframe just below TRAMPOLINE, for trampoline.S. mappages(pagetable, TRAPFRAME, PGSIZE, -- cgit v1.2.3