diff options
| author | Robert Morris <[email protected]> | 2019-07-26 04:53:46 -0400 |
|---|---|---|
| committer | Robert Morris <[email protected]> | 2019-07-26 04:53:46 -0400 |
| commit | ea95a6654c3f921849f3541aa856a8806ebf571e (patch) | |
| tree | 39c865dd156a02712124697570579f93d2e6f37e /kernel/proc.c | |
| parent | 4e62de64cd3b8b67bdb2c3d8edab1ca353427a84 (diff) | |
| download | xv6-labs-ea95a6654c3f921849f3541aa856a8806ebf571e.tar.gz xv6-labs-ea95a6654c3f921849f3541aa856a8806ebf571e.tar.bz2 xv6-labs-ea95a6654c3f921849f3541aa856a8806ebf571e.zip | |
trampin -> uservec
trampout -> userret
Diffstat (limited to 'kernel/proc.c')
| -rw-r--r-- | kernel/proc.c | 4 |
1 files changed, 2 insertions, 2 deletions
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, |