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

This commit is contained in:
Austin Clements 2011-09-14 13:47:04 -04:00
parent c092540e39
commit 1e6f0146d2

4
main.c
View file

@ -106,9 +106,9 @@ startothers(void)
__attribute__((__aligned__(PGSIZE))) __attribute__((__aligned__(PGSIZE)))
pde_t entrypgdir[NPDENTRIES] = { pde_t entrypgdir[NPDENTRIES] = {
// Map VA's [0, 4MB) to PA's [0, 4MB) // 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) // 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! //PAGEBREAK!