From 48755214c9a02d6249caf3126d3b41d67eda4730 Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Sun, 30 Aug 2009 23:02:08 -0700 Subject: assorted fixes: * rename c/cp to cpu/proc * rename cpu.context to cpu.scheduler * fix some comments * formatting for printout --- mp.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'mp.c') diff --git a/mp.c b/mp.c index 393119d..e1edf24 100644 --- a/mp.c +++ b/mp.c @@ -103,20 +103,22 @@ mpinit(void) struct mpproc *proc; struct mpioapic *ioapic; - bcpu = &cpus[ncpu]; + bcpu = &cpus[0]; if((conf = mpconfig(&mp)) == 0) return; - ismp = 1; lapic = (uint*)conf->lapicaddr; - for(p=(uchar*)(conf+1), e=(uchar*)conf+conf->length; papicid; + if(ncpu != proc->apicid) { + cprintf("mpinit: ncpu=%d apicpid=%d", ncpu, proc->apicid); + panic("mpinit"); + } if(proc->flags & MPBOOT) bcpu = &cpus[ncpu]; + cpus[ncpu].id = ncpu; ncpu++; p += sizeof(struct mpproc); continue; @@ -135,7 +137,6 @@ mpinit(void) panic("mpinit"); } } - if(mp->imcrp){ // Bochs doesn't support IMCR, so this doesn't run on Bochs. // But it would on real hardware. -- cgit v1.2.3