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

diff --git a/main.c b/main.c
index a5bbf407c2138a5bd9de4a9539baf7a3ef71f9d9..c0c3a917bbb9ab9a6e48cfd4140bf48f037d9249 100644 (file)
--- 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!