diff options
| author | Steve Passe <fsmp@FreeBSD.org> | 1997-08-10 19:32:38 +0000 |
|---|---|---|
| committer | Steve Passe <fsmp@FreeBSD.org> | 1997-08-10 19:32:38 +0000 |
| commit | cb02d4da35d5ed8f7800ad1d94c8ce8014406e6b (patch) | |
| tree | d42e9848aac929e23abfa2082cc17aff8384334d /sys/kern/subr_smp.c | |
| parent | 84dc22996da39f0d729487f9223011ec189d020f (diff) | |
| download | src-cb02d4da35d5ed8f7800ad1d94c8ce8014406e6b.tar.gz src-cb02d4da35d5ed8f7800ad1d94c8ce8014406e6b.zip | |
Cheap fix for kern/4255.
If the problem is seen this fix suggests a compile-time work-around then panics.
Notes
Notes:
svn path=/head/; revision=28041
Diffstat (limited to 'sys/kern/subr_smp.c')
| -rw-r--r-- | sys/kern/subr_smp.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/sys/kern/subr_smp.c b/sys/kern/subr_smp.c index db6db9027ac5..ce107d99b040 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.26 1997/08/09 22:12:14 smp Exp $ + * $Id: mp_machdep.c,v 1.40 1997/08/09 23:01:03 fsmp Exp $ */ #include "opt_smp.h" @@ -724,12 +724,18 @@ mptable_pass1(void) /* qualify the numbers */ if (mp_naps > NCPU) +#if 0 /* XXX FIXME: kern/4255 */ printf("Warning: only using %d of %d available CPUs!\n", NCPU, mp_naps); -#if 0 - /** XXX we consider this legal now (but should we?) */ +#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; -#endif + } +#endif /* XXX FIXME: kern/4255 */ if (mp_nbusses > NBUS) { printf("found %d busses, increase NBUS\n", mp_nbusses); mustpanic = 1; |