enterpgdir -> entrypgdir

1 files changed, 5 insertions, 5 deletions

diff --git a/main.c b/main.c
index 9ebd7c8..23e0316 100644
--- a/main.c
+++ b/main.c
@@ -60,7 +60,7 @@ mpmain(void)
   scheduler();     // start running processes
 }
 
-pde_t enterpgdir[];  // For entry.S
+pde_t entrypgdir[];  // For entry.S
 
 // Start the non-boot (AP) processors.
 static void
@@ -83,15 +83,15 @@ startothers(void)
 
     // Tell entryother.S what stack to use, the address of mpenter and pgdir;
     // We cannot use kpgdir yet, because the AP processor is running in low 
-    // memory, so we use enterpgdir for the APs too.  kalloc can return addresses
+    // memory, so we use entrypgdir for the APs too.  kalloc can return addresses
     // above 4Mbyte (the machine may have much more physical memory than 4Mbyte), which 
-    // aren't mapped by enterpgdir, so we must allocate a stack using enter_alloc();
+    // aren't mapped by entrypgdir, so we must allocate a stack using enter_alloc();
     // This introduces the constraint that xv6 cannot use kalloc until after these 
     // last enter_alloc invocations.
     stack = enter_alloc();
     *(void**)(code-4) = stack + KSTACKSIZE;
     *(void**)(code-8) = mpenter;
-    *(int**)(code-12) = (void *) v2p(enterpgdir);
+    *(int**)(code-12) = (void *) v2p(entrypgdir);
 
     lapicstartap(c->id, v2p(code));
 
@@ -106,7 +106,7 @@ startothers(void)
 // hence the "__aligned__" attribute.  
 // Use PTE_PS in page directory entry to enable 4Mbyte pages.
 __attribute__((__aligned__(PGSIZE)))
-pde_t enterpgdir[NPDENTRIES] = {
+pde_t entrypgdir[NPDENTRIES] = {
   // Map VA's [0, 4MB) to PA's [0, 4MB)
   [0] = (0) + PTE_P + PTE_W + PTE_PS,
   // Map VA's [KERNBASE, KERNBASE+4MB) to PA's [0, 4MB)