summaryrefslogtreecommitdiff
path: root/main.c
diff options
context:
space:
mode:
authorkaashoek <kaashoek>2006-06-21 01:53:07 +0000
committerkaashoek <kaashoek>2006-06-21 01:53:07 +0000
commit7baa34a421e4c970ee90c2537ceacd7230f2474e (patch)
tree5cc26d0b33d22588eea93abe9ad5cfea24cecede /main.c
parentae6e8aa730fa410118c0532938d4a9e62b08bbe8 (diff)
downloadxv6-labs-7baa34a421e4c970ee90c2537ceacd7230f2474e.tar.gz
xv6-labs-7baa34a421e4c970ee90c2537ceacd7230f2474e.tar.bz2
xv6-labs-7baa34a421e4c970ee90c2537ceacd7230f2474e.zip
start on MP; detect MP configuration
Diffstat (limited to 'main.c')
-rw-r--r--main.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/main.c b/main.c
index 2f3b00e..07b3862 100644
--- a/main.c
+++ b/main.c
@@ -22,6 +22,7 @@ main()
cprintf("\nxV6\n\n");
+ mpinit(); // multiprocessor
kinit(); // physical memory allocator
tinit(); // traps and interrupts
pic_init();
@@ -47,7 +48,7 @@ main()
write_eflags(read_eflags() | FL_IF);
irq_setmask_8259A(0);
-#if 1
+#if 0
ide_read(0, buf, 1);
cprintf("sec0.0 %x\n", buf[0] & 0xff);
#endif