From: Austin Clements <amdragon@mit.edu>
Date: Wed, 14 Sep 2011 17:47:04 +0000 (-0400)
Subject: Use | instead of + for entrypgdir.  Linker doesn't get in our way here.
X-Git-Url: https://git.devinivas.org/?a=commitdiff_plain;h=1e6f0146d2e194045188ba24826eaaaee05605cb;p=cs3210-lab1.git

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

diff --git a/main.c b/main.c
index a5bbf40..c0c3a91 100644
--- 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!