diff options
| author | nyan <nyan@FreeBSD.org> | 2006-03-10 12:18:41 +0000 |
|---|---|---|
| committer | nyan <nyan@FreeBSD.org> | 2006-03-10 12:18:41 +0000 |
| commit | 3b59efd81b77f305beffceb0e7e32ebb22bd1bb5 (patch) | |
| tree | ffcde6e0d34c0a86ea89836a218f590f181eca7e | |
| parent | ba6a23db6e42f9cc2993e8d627e762b734ac117d (diff) | |
| download | FreeBSD-src-3b59efd81b77f305beffceb0e7e32ebb22bd1bb5.zip FreeBSD-src-3b59efd81b77f305beffceb0e7e32ebb22bd1bb5.tar.gz | |
Disable an SMP detection on pc98.
| -rw-r--r-- | release/pc98/boot_crunch.conf | 2 | ||||
| -rw-r--r-- | usr.sbin/sade/Makefile | 2 | ||||
| -rw-r--r-- | usr.sbin/sade/install.c | 2 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/Makefile | 2 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/install.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/release/pc98/boot_crunch.conf b/release/pc98/boot_crunch.conf index 78061dd..b630c88 100644 --- a/release/pc98/boot_crunch.conf +++ b/release/pc98/boot_crunch.conf @@ -40,4 +40,4 @@ progs ppp progs sysinstall libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph -libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs -ldevinfo +libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs diff --git a/usr.sbin/sade/Makefile b/usr.sbin/sade/Makefile index c735c26..4c760a2 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 dbd12b0..3ff7d8e 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(); diff --git a/usr.sbin/sysinstall/Makefile b/usr.sbin/sysinstall/Makefile index c735c26..4c760a2 100644 --- a/usr.sbin/sysinstall/Makefile +++ b/usr.sbin/sysinstall/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/sysinstall/install.c b/usr.sbin/sysinstall/install.c index dbd12b0..3ff7d8e 100644 --- a/usr.sbin/sysinstall/install.c +++ b/usr.sbin/sysinstall/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(); |
