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/vm.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/vm.c')
| -rw-r--r-- | kernel/vm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/vm.c b/kernel/vm.c index 33469d1..a1c36ba 100644 --- a/kernel/vm.c +++ b/kernel/vm.c @@ -13,7 +13,7 @@ pagetable_t kernel_pagetable; extern char etext[]; // kernel.ld sets this to end of kernel code. -extern char trampout[]; // trampoline.S +extern char trampoline[]; // trampoline.S /* * create a direct-map page table for the kernel and @@ -46,7 +46,7 @@ kvminit() // map the trampoline for trap entry/exit to // the highest virtual address in the kernel. - kvmmap(TRAMPOLINE, (uint64)trampout, PGSIZE, PTE_R | PTE_X); + kvmmap(TRAMPOLINE, (uint64)trampoline, PGSIZE, PTE_R | PTE_X); } // Switch h/w page table register to the kernel's page table, |