diff options
| author | Yoshihiro Takahashi <nyan@FreeBSD.org> | 2006-03-10 12:18:41 +0000 |
|---|---|---|
| committer | Yoshihiro Takahashi <nyan@FreeBSD.org> | 2006-03-10 12:18:41 +0000 |
| commit | fe91068c3c3bc1dee4593840eb4f7e4ca8bb4045 (patch) | |
| tree | ffcde6e0d34c0a86ea89836a218f590f181eca7e /usr.sbin/sade | |
| parent | 5f0c9ae10a77ae1123322e704ee4aaf39eceb876 (diff) | |
| download | src-fe91068c3c3bc1dee4593840eb4f7e4ca8bb4045.tar.gz src-fe91068c3c3bc1dee4593840eb4f7e4ca8bb4045.zip | |
Disable an SMP detection on pc98.
Notes
Notes:
svn path=/head/; revision=156533
Diffstat (limited to 'usr.sbin/sade')
| -rw-r--r-- | usr.sbin/sade/Makefile | 2 | ||||
| -rw-r--r-- | usr.sbin/sade/install.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/sade/Makefile b/usr.sbin/sade/Makefile index c735c2695bf8..4c760a2569d3 100644 --- a/usr.sbin/sade/Makefile +++ b/usr.sbin/sade/Makefile @@ -45,7 +45,7 @@ LDADD= -ldialog -lncurses -lutil -ldisk -lftpio # that is painful because of media changes and the structure of # sysinstall so for now it's a priori. # -.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" +.if ${MACHINE} == "i386" || ${MACHINE_ARCH} == "amd64" SRCS+= acpi.c biosmptable.c # NB: HEAD has SMP in GENERIC so only one kernel #CFLAGS+=-DWITH_SMP diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c index dbd12b0cff99..3ff7d8ec6771 100644 --- a/usr.sbin/sade/install.c +++ b/usr.sbin/sade/install.c @@ -1232,7 +1232,7 @@ installVarDefaults(dialogMenuItem *self) variable_set2(SYSTEM_STATE, "init", 0); variable_set2(VAR_NEWFS_ARGS, "-b 16384 -f 2048", 0); variable_set2(VAR_CONSTERM, "NO", 0); -#if defined(i386) || defined(amd64) +#if (defined(__i386__) && !defined(PC98)) || defined(__amd64__) NCpus = acpi_detect(); if (NCpus == -1) NCpus = biosmptable_detect(); |