diff options
| author | Austin Clements <amdragon@mit.edu> | 2011-09-14 13:47:04 -0400 |
|---|---|---|
| committer | Austin Clements <amdragon@mit.edu> | 2011-09-14 13:47:04 -0400 |
| commit | 1e6f0146d2e194045188ba24826eaaaee05605cb (patch) | |
| tree | 5919d7be34bb722d0312a79253fcd640d941db0e /main.c | |
| parent | c092540e396ae748e3775e582681e51abd94f41d (diff) | |
| download | xv6-labs-1e6f0146d2e194045188ba24826eaaaee05605cb.tar.gz xv6-labs-1e6f0146d2e194045188ba24826eaaaee05605cb.tar.bz2 xv6-labs-1e6f0146d2e194045188ba24826eaaaee05605cb.zip | |
Use | instead of + for entrypgdir. Linker doesn't get in our way here.
Diffstat (limited to 'main.c')
| -rw-r--r-- | main.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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! |