Merged the rest of changes in sys/i386/i386/machdep.c revision 1.447.

This commit is contained in:
KATO Takenori 2001-05-02 13:48:39 +00:00
parent 127826924a
commit 281238b184
2 changed files with 10 additions and 12 deletions

View File

@ -66,6 +66,7 @@
#include <sys/bio.h>
#include <sys/buf.h>
#include <sys/reboot.h>
#include <sys/smp.h>
#include <sys/callout.h>
#include <sys/msgbuf.h>
#include <sys/sysent.h>
@ -104,9 +105,6 @@
#include <machine/globaldata.h>
#include <machine/globals.h>
#include <machine/intrcnt.h>
#ifdef SMP
#include <machine/smp.h>
#endif
#ifdef PERFMON
#include <machine/perfmon.h>
#endif
@ -454,9 +452,10 @@ cpu_startup(dummy)
#ifdef SMP
globaldata_register(GLOBALDATA);
#endif
#else
/* For SMP, we delay the cpu_setregs() until after SMP startup. */
cpu_setregs();
#endif
}
/*
@ -1924,7 +1923,7 @@ getmemsize(int first)
physmap[1] = mp_bootaddress(physmap[1] / 1024);
/* look for the MP hardware - needed for apic addresses */
mp_probe();
i386_mp_probe();
#endif
/*

View File

@ -66,6 +66,7 @@
#include <sys/bio.h>
#include <sys/buf.h>
#include <sys/reboot.h>
#include <sys/smp.h>
#include <sys/callout.h>
#include <sys/msgbuf.h>
#include <sys/sysent.h>
@ -104,9 +105,6 @@
#include <machine/globaldata.h>
#include <machine/globals.h>
#include <machine/intrcnt.h>
#ifdef SMP
#include <machine/smp.h>
#endif
#ifdef PERFMON
#include <machine/perfmon.h>
#endif
@ -454,9 +452,10 @@ cpu_startup(dummy)
#ifdef SMP
globaldata_register(GLOBALDATA);
#endif
#else
/* For SMP, we delay the cpu_setregs() until after SMP startup. */
cpu_setregs();
#endif
}
/*
@ -1924,7 +1923,7 @@ getmemsize(int first)
physmap[1] = mp_bootaddress(physmap[1] / 1024);
/* look for the MP hardware - needed for apic addresses */
mp_probe();
i386_mp_probe();
#endif
/*