From 4f14d8d1e594bdf45e36a035f6c3fd4ca959711e Mon Sep 17 00:00:00 2001 From: Frans Kaashoek Date: Wed, 9 Aug 2017 07:43:06 -0400 Subject: 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. --- mp.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'mp.c') diff --git a/mp.c b/mp.c index ade8930..79bb0ad 100644 --- a/mp.c +++ b/mp.c @@ -12,7 +12,6 @@ #include "proc.h" struct cpu cpus[NCPU]; -int ismp; int ncpu; uchar ioapicid; @@ -93,13 +92,14 @@ void mpinit(void) { uchar *p, *e; + int ismp; struct mp *mp; struct mpconf *conf; struct mpproc *proc; struct mpioapic *ioapic; if((conf = mpconfig(&mp)) == 0) - return; + panic("Expect to run on an SMP"); ismp = 1; lapic = (uint*)conf->lapicaddr; for(p=(uchar*)(conf+1), e=(uchar*)conf+conf->length; pimcrp){ // Bochs doesn't support IMCR, so this doesn't run on Bochs. -- cgit v1.2.3