CS-444
/
jos
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix up bad merge conflict fix.

This commit is contained in:
Danila Fedorin 2019-05-02 17:05:07 -07:00
parent 34e9433d15
commit d943a2be37
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kern/pmap.c
View File

@ -211,11 +211,6 @@ mem_init(void)
boot_map_region(kern_pgdir,
KSTACKTOP-KSTKSIZE, KSTKSIZE,
PADDR(bootstack), PTE_W);
<<<<<<< HEAD
kern_pgdir[PDX(KSTACKTOP-KSTKSIZE)] |= PTE_W;
kern_pgdir[PDX(KSTACKTOP-KSTKSIZE)] &= ~PTE_U;
=======
>>>>>>> lab2
//////////////////////////////////////////////////////////////////////
// Map all of physical memory at KERNBASE.