xv6

Unnamed repository; edit this file 'description' to name the repository.
Log | Files | Refs | README | LICENSE

commit 1e6f0146d2e194045188ba24826eaaaee05605cb
parent c092540e396ae748e3775e582681e51abd94f41d
Author: Austin Clements <amdragon@mit.edu>
Date:   Wed, 14 Sep 2011 13:47:04 -0400

Use | instead of + for entrypgdir.  Linker doesn't get in our way here.

Diffstat:
Mmain.c | 4++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/main.c b/main.c @@ -106,9 +106,9 @@ startothers(void) __attribute__((__aligned__(PGSIZE))) pde_t entrypgdir[NPDENTRIES] = { // Map VA's [0, 4MB) to PA's [0, 4MB) - [0] = (0) + PTE_P + PTE_W + PTE_PS, + [0] = (0) | PTE_P | PTE_W | PTE_PS, // Map VA's [KERNBASE, KERNBASE+4MB) to PA's [0, 4MB) - [KERNBASE>>PDXSHIFT] = (0) + PTE_P + PTE_W + PTE_PS, + [KERNBASE>>PDXSHIFT] = (0) | PTE_P | PTE_W | PTE_PS, }; //PAGEBREAK!