summaryrefslogtreecommitdiff
path: root/main.c
diff options
context:
space:
mode:
authorRobert Morris <[email protected]>2016-08-24 13:40:06 -0400
committerRobert Morris <[email protected]>2016-08-24 13:40:06 -0400
commita7c03bd91490a10383b7241e41f79e57a09cf212 (patch)
tree912c7602a573f0fd1e676771f082018b6a48b56d /main.c
parent7a77375d64675a6d05b47531ebb24205a3f36483 (diff)
downloadxv6-labs-a7c03bd91490a10383b7241e41f79e57a09cf212.tar.gz
xv6-labs-a7c03bd91490a10383b7241e41f79e57a09cf212.tar.bz2
xv6-labs-a7c03bd91490a10383b7241e41f79e57a09cf212.zip
p2v -> P2V
Diffstat (limited to 'main.c')
-rw-r--r--main.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/main.c b/main.c
index 84a7c52..74e61fb 100644
--- a/main.c
+++ b/main.c
@@ -74,7 +74,7 @@ startothers(void)
// Write entry code to unused memory at 0x7000.
// The linker has placed the image of entryother.S in
// _binary_entryother_start.
- code = p2v(0x7000);
+ code = P2V(0x7000);
memmove(code, _binary_entryother_start, (uint)_binary_entryother_size);
for(c = cpus; c < cpus+ncpu; c++){
@@ -87,9 +87,9 @@ startothers(void)
stack = kalloc();
*(void**)(code-4) = stack + KSTACKSIZE;
*(void**)(code-8) = mpenter;
- *(int**)(code-12) = (void *) v2p(entrypgdir);
+ *(int**)(code-12) = (void *) V2P(entrypgdir);
- lapicstartap(c->id, v2p(code));
+ lapicstartap(c->id, V2P(code));
// wait for cpu to finish mpmain()
while(c->started == 0)