Permalink
Browse files

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

  • Loading branch information...
1 parent c092540 commit 1e6f0146d2e194045188ba24826eaaaee05605cb @aclements aclements committed Sep 14, 2011
Showing with 2 additions and 2 deletions.
  1. +2 −2 main.c
View
4 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!

0 comments on commit 1e6f014

Please sign in to comment.