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

Merge branch 'lab3' into lab4

Browse Source
This commit is contained in:
Danila Fedorin
2019-05-02 17:08:09 -07:00
parent 1e5c0639ee d943a2be37
commit 46e7d21fbf
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
kern/pmap.c
View File

@@ -213,11 +213,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.