From 35d9b239158e4d5cc794b91f864d4851c9411ba5 Mon Sep 17 00:00:00 2001 From: msmith Date: Wed, 23 Jun 1999 23:02:38 +0000 Subject: Changes in the way that the APs are started appears to have removed the problem with having more CPUs than NCPU. PR: kern/4255 Submitted by: peter --- sys/amd64/amd64/mp_machdep.c | 14 +++----------- sys/amd64/amd64/mptable.c | 14 +++----------- sys/amd64/include/mptable.h | 14 +++----------- sys/i386/i386/mp_machdep.c | 14 +++----------- sys/i386/i386/mptable.c | 14 +++----------- sys/i386/include/mptable.h | 14 +++----------- sys/kern/subr_smp.c | 14 +++----------- 7 files changed, 21 insertions(+), 77 deletions(-) diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c index 5a9f672..9d8be53 100644 --- a/sys/amd64/amd64/mp_machdep.c +++ b/sys/amd64/amd64/mp_machdep.c @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: mp_machdep.c,v 1.103 1999/06/22 20:54:25 msmith Exp $ + * $Id: mp_machdep.c,v 1.104 1999/06/23 21:47:22 luoqi Exp $ */ #include "opt_smp.h" @@ -826,19 +826,11 @@ mptable_pass1(void) } /* qualify the numbers */ - if (mp_naps > NCPU) -#if 0 /* XXX FIXME: kern/4255 */ + if (mp_naps > NCPU) { printf("Warning: only using %d of %d available CPUs!\n", NCPU, mp_naps); -#else - { - printf("NCPU cannot be different than actual CPU count.\n"); - printf(" add 'options NCPU=%d' to your kernel config file,\n", - mp_naps); - printf(" then rerun config & rebuild your SMP kernel\n"); - mustpanic = 1; + mp_naps = NCPU; } -#endif /* XXX FIXME: kern/4255 */ if (mp_nbusses > NBUS) { printf("found %d busses, increase NBUS\n", mp_nbusses); mustpanic = 1; diff --git a/sys/amd64/amd64/mptable.c b/sys/amd64/amd64/mptable.c index 5a9f672..9d8be53 100644 --- a/sys/amd64/amd64/mptable.c +++ b/sys/amd64/amd64/mptable.c @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: mp_machdep.c,v 1.103 1999/06/22 20:54:25 msmith Exp $ + * $Id: mp_machdep.c,v 1.104 1999/06/23 21:47:22 luoqi Exp $ */ #include "opt_smp.h" @@ -826,19 +826,11 @@ mptable_pass1(void) } /* qualify the numbers */ - if (mp_naps > NCPU) -#if 0 /* XXX FIXME: kern/4255 */ + if (mp_naps > NCPU) { printf("Warning: only using %d of %d available CPUs!\n", NCPU, mp_naps); -#else - { - printf("NCPU cannot be different than actual CPU count.\n"); - printf(" add 'options NCPU=%d' to your kernel config file,\n", - mp_naps); - printf(" then rerun config & rebuild your SMP kernel\n"); - mustpanic = 1; + mp_naps = NCPU; } -#endif /* XXX FIXME: kern/4255 */ if (mp_nbusses > NBUS) { printf("found %d busses, increase NBUS\n", mp_nbusses); mustpanic = 1; diff --git a/sys/amd64/include/mptable.h b/sys/amd64/include/mptable.h index 5a9f672..9d8be53 100644 --- a/sys/amd64/include/mptable.h +++ b/sys/amd64/include/mptable.h @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: mp_machdep.c,v 1.103 1999/06/22 20:54:25 msmith Exp $ + * $Id: mp_machdep.c,v 1.104 1999/06/23 21:47:22 luoqi Exp $ */ #include "opt_smp.h" @@ -826,19 +826,11 @@ mptable_pass1(void) } /* qualify the numbers */ - if (mp_naps > NCPU) -#if 0 /* XXX FIXME: kern/4255 */ + if (mp_naps > NCPU) { printf("Warning: only using %d of %d available CPUs!\n", NCPU, mp_naps); -#else - { - printf("NCPU cannot be different than actual CPU count.\n"); - printf(" add 'options NCPU=%d' to your kernel config file,\n", - mp_naps); - printf(" then rerun config & rebuild your SMP kernel\n"); - mustpanic = 1; + mp_naps = NCPU; } -#endif /* XXX FIXME: kern/4255 */ if (mp_nbusses > NBUS) { printf("found %d busses, increase NBUS\n", mp_nbusses); mustpanic = 1; diff --git a/sys/i386/i386/mp_machdep.c b/sys/i386/i386/mp_machdep.c index 5a9f672..9d8be53 100644 --- a/sys/i386/i386/mp_machdep.c +++ b/sys/i386/i386/mp_machdep.c @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: mp_machdep.c,v 1.103 1999/06/22 20:54:25 msmith Exp $ + * $Id: mp_machdep.c,v 1.104 1999/06/23 21:47:22 luoqi Exp $ */ #include "opt_smp.h" @@ -826,19 +826,11 @@ mptable_pass1(void) } /* qualify the numbers */ - if (mp_naps > NCPU) -#if 0 /* XXX FIXME: kern/4255 */ + if (mp_naps > NCPU) { printf("Warning: only using %d of %d available CPUs!\n", NCPU, mp_naps); -#else - { - printf("NCPU cannot be different than actual CPU count.\n"); - printf(" add 'options NCPU=%d' to your kernel config file,\n", - mp_naps); - printf(" then rerun config & rebuild your SMP kernel\n"); - mustpanic = 1; + mp_naps = NCPU; } -#endif /* XXX FIXME: kern/4255 */ if (mp_nbusses > NBUS) { printf("found %d busses, increase NBUS\n", mp_nbusses); mustpanic = 1; diff --git a/sys/i386/i386/mptable.c b/sys/i386/i386/mptable.c index 5a9f672..9d8be53 100644 --- a/sys/i386/i386/mptable.c +++ b/sys/i386/i386/mptable.c @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: mp_machdep.c,v 1.103 1999/06/22 20:54:25 msmith Exp $ + * $Id: mp_machdep.c,v 1.104 1999/06/23 21:47:22 luoqi Exp $ */ #include "opt_smp.h" @@ -826,19 +826,11 @@ mptable_pass1(void) } /* qualify the numbers */ - if (mp_naps > NCPU) -#if 0 /* XXX FIXME: kern/4255 */ + if (mp_naps > NCPU) { printf("Warning: only using %d of %d available CPUs!\n", NCPU, mp_naps); -#else - { - printf("NCPU cannot be different than actual CPU count.\n"); - printf(" add 'options NCPU=%d' to your kernel config file,\n", - mp_naps); - printf(" then rerun config & rebuild your SMP kernel\n"); - mustpanic = 1; + mp_naps = NCPU; } -#endif /* XXX FIXME: kern/4255 */ if (mp_nbusses > NBUS) { printf("found %d busses, increase NBUS\n", mp_nbusses); mustpanic = 1; diff --git a/sys/i386/include/mptable.h b/sys/i386/include/mptable.h index 5a9f672..9d8be53 100644 --- a/sys/i386/include/mptable.h +++ b/sys/i386/include/mptable.h @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: mp_machdep.c,v 1.103 1999/06/22 20:54:25 msmith Exp $ + * $Id: mp_machdep.c,v 1.104 1999/06/23 21:47:22 luoqi Exp $ */ #include "opt_smp.h" @@ -826,19 +826,11 @@ mptable_pass1(void) } /* qualify the numbers */ - if (mp_naps > NCPU) -#if 0 /* XXX FIXME: kern/4255 */ + if (mp_naps > NCPU) { printf("Warning: only using %d of %d available CPUs!\n", NCPU, mp_naps); -#else - { - printf("NCPU cannot be different than actual CPU count.\n"); - printf(" add 'options NCPU=%d' to your kernel config file,\n", - mp_naps); - printf(" then rerun config & rebuild your SMP kernel\n"); - mustpanic = 1; + mp_naps = NCPU; } -#endif /* XXX FIXME: kern/4255 */ if (mp_nbusses > NBUS) { printf("found %d busses, increase NBUS\n", mp_nbusses); mustpanic = 1; diff --git a/sys/kern/subr_smp.c b/sys/kern/subr_smp.c index 5a9f672..9d8be53 100644 --- a/sys/kern/subr_smp.c +++ b/sys/kern/subr_smp.c @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: mp_machdep.c,v 1.103 1999/06/22 20:54:25 msmith Exp $ + * $Id: mp_machdep.c,v 1.104 1999/06/23 21:47:22 luoqi Exp $ */ #include "opt_smp.h" @@ -826,19 +826,11 @@ mptable_pass1(void) } /* qualify the numbers */ - if (mp_naps > NCPU) -#if 0 /* XXX FIXME: kern/4255 */ + if (mp_naps > NCPU) { printf("Warning: only using %d of %d available CPUs!\n", NCPU, mp_naps); -#else - { - printf("NCPU cannot be different than actual CPU count.\n"); - printf(" add 'options NCPU=%d' to your kernel config file,\n", - mp_naps); - printf(" then rerun config & rebuild your SMP kernel\n"); - mustpanic = 1; + mp_naps = NCPU; } -#endif /* XXX FIXME: kern/4255 */ if (mp_nbusses > NBUS) { printf("found %d busses, increase NBUS\n", mp_nbusses); mustpanic = 1; -- cgit v1.1