summaryrefslogtreecommitdiff
path: root/main.c
diff options
context:
space:
mode:
authorrtm <rtm>2006-06-26 20:31:52 +0000
committerrtm <rtm>2006-06-26 20:31:52 +0000
commitb61c2547b8b489cab16984c0940a1cb6593a2a3d (patch)
tree3ff33920d08b6221ec32b7aaff583a32edc8001b /main.c
parenta44ee3cde8b55c314410210b9f3076797b9925fc (diff)
downloadxv6-labs-b61c2547b8b489cab16984c0940a1cb6593a2a3d.tar.gz
xv6-labs-b61c2547b8b489cab16984c0940a1cb6593a2a3d.tar.bz2
xv6-labs-b61c2547b8b489cab16984c0940a1cb6593a2a3d.zip
system call return values
initialize 2nd cpu's idt
Diffstat (limited to 'main.c')
-rw-r--r--main.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/main.c b/main.c
index 206daf3..1226a8f 100644
--- a/main.c
+++ b/main.c
@@ -25,6 +25,7 @@ main()
cprintf("an application processor\n");
release_spinlock(&kernel_lock);
acquire_spinlock(&kernel_lock);
+ idtinit();
lapic_init(cpu());
curproc[cpu()] = &proc[0]; // XXX
swtch();
@@ -37,7 +38,8 @@ main()
mp_init(); // multiprocessor
kinit(); // physical memory allocator
- tinit(); // traps and interrupts
+ tvinit(); // trap vectors
+ idtinit(); // CPU's idt
pic_init();
// create fake process zero