Fix up bad merge conflict fix.
This commit is contained in:
parent
34e9433d15
commit
d943a2be37
|
@ -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.
|
||||
|
|
Loading…
Reference in New Issue
Block a user