summaryrefslogtreecommitdiff
path: root/main.c
diff options
context:
space:
mode:
authorRobert Morris <[email protected]>2012-08-28 12:57:13 -0400
committerRobert Morris <[email protected]>2012-08-28 12:57:13 -0400
commitc1ee7eb4d31bd17e48857479fec8f4c2065d4b7d (patch)
treee54d9304b6f5d90bdf7a926808fd7d5923d39526 /main.c
parent8960f60b30b69a1f45ffa9d8b2b204714725f1fa (diff)
parent951b77f7eced2165312d5c12d6256e874dba10f8 (diff)
downloadxv6-labs-c1ee7eb4d31bd17e48857479fec8f4c2065d4b7d.tar.gz
xv6-labs-c1ee7eb4d31bd17e48857479fec8f4c2065d4b7d.tar.bz2
xv6-labs-c1ee7eb4d31bd17e48857479fec8f4c2065d4b7d.zip
Merge branch 'master' of git+ssh://amsterdam.csail.mit.edu/home/am0/6.828/xv6
Diffstat (limited to 'main.c')
-rw-r--r--main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/main.c b/main.c
index c0c3a91..712958f 100644
--- a/main.c
+++ b/main.c
@@ -20,7 +20,7 @@ main(void)
kinit1(end, P2V(4*1024*1024)); // phys page allocator
kvmalloc(); // kernel page table
mpinit(); // collect info about this machine
- lapicinit(mpbcpu());
+ lapicinit();
seginit(); // set up segments
cprintf("\ncpu%d: starting xv6\n\n", cpu->id);
picinit(); // interrupt controller
@@ -48,7 +48,7 @@ mpenter(void)
{
switchkvm();
seginit();
- lapicinit(cpunum());
+ lapicinit();
mpmain();
}