From 50cbc7510250a64674d619d13f5912edf08b767d Mon Sep 17 00:00:00 2001 From: Robert Morris Date: Sat, 1 Jun 2019 05:33:38 -0400 Subject: first shell prints $ prompt, though no console input yet --- proc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'proc.c') diff --git a/proc.c b/proc.c index f0120c2..909b88d 100644 --- a/proc.c +++ b/proc.c @@ -24,7 +24,7 @@ extern void sysexit(void); static void wakeup1(void *chan); -extern char trampstart[]; // trampoline.S +extern char trampout[]; // trampoline.S void procinit(void) @@ -123,7 +123,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)trampstart, PTE_R | PTE_X); + (uint64)trampout, PTE_R | PTE_X); // map the trapframe, for trampoline.S. mappages(pagetable, (TRAMPOLINE - PGSIZE), PGSIZE, -- cgit v1.2.3