summaryrefslogtreecommitdiff
path: root/main.c
diff options
context:
space:
mode:
authorkaashoek <kaashoek>2006-07-12 17:00:54 +0000
committerkaashoek <kaashoek>2006-07-12 17:00:54 +0000
commitf27a68a24a3e0980499db8920fc7306dbab7d52d (patch)
treee8c8ed65634e2a987770b1f10e3336f4b2fd4b04 /main.c
parent6eb6f10c5668bc2bdf5e561e0060e7e917ed55c1 (diff)
downloadxv6-labs-f27a68a24a3e0980499db8920fc7306dbab7d52d.tar.gz
xv6-labs-f27a68a24a3e0980499db8920fc7306dbab7d52d.tar.bz2
xv6-labs-f27a68a24a3e0980499db8920fc7306dbab7d52d.zip
extract lapic code from mp.c
Diffstat (limited to 'main.c')
-rw-r--r--main.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/main.c b/main.c
index 9015ff7..fe85054 100644
--- a/main.c
+++ b/main.c
@@ -38,11 +38,14 @@ main()
// clear BSS
memset(edata, 0, end - edata);
- mp_init(); // just set up apic so cpu() works
+ mp_init(); // collect info about this machine
+
use_printf_lock = 1;
cpus[cpu()].clis = 1; // cpu starts as if we had called cli()
+ lapic_init(mp_bcpu());
+
cprintf("\nxV6\n\n");
pic_init(); // initialize PIC