summaryrefslogtreecommitdiff
path: root/main.c
diff options
context:
space:
mode:
authorFrans Kaashoek <[email protected]>2017-08-09 07:43:06 -0400
committerFrans Kaashoek <[email protected]>2017-08-09 07:44:51 -0400
commit4f14d8d1e594bdf45e36a035f6c3fd4ca959711e (patch)
treebef4071d263d8dc36f4a01e9342b0a697dc1dc7b /main.c
parent70705966adb7a055582f76f2ecdb5ce9cd3c8a85 (diff)
downloadxv6-labs-4f14d8d1e594bdf45e36a035f6c3fd4ca959711e.tar.gz
xv6-labs-4f14d8d1e594bdf45e36a035f6c3fd4ca959711e.tar.bz2
xv6-labs-4f14d8d1e594bdf45e36a035f6c3fd4ca959711e.zip
Commit to running on an SMP (perhaps with only 1 core). Remove most code
from picirq.c and remove timer.c completely. Update runoff.list.
Diffstat (limited to 'main.c')
-rw-r--r--main.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/main.c b/main.c
index e5b7d64..6bdeab4 100644
--- a/main.c
+++ b/main.c
@@ -22,7 +22,7 @@ main(void)
mpinit(); // detect other processors
lapicinit(); // interrupt controller
seginit(); // segment descriptors
- picinit(); // another interrupt controller
+ picinit(); // disable pic
ioapicinit(); // another interrupt controller
consoleinit(); // console hardware
uartinit(); // serial port
@@ -31,8 +31,6 @@ main(void)
binit(); // buffer cache
fileinit(); // file table
ideinit(); // disk
- if(!ismp)
- timerinit(); // uniprocessor timer
startothers(); // start other processors
kinit2(P2V(4*1024*1024), P2V(PHYSTOP)); // must come after startothers()
userinit(); // first user process