From 3b59efd81b77f305beffceb0e7e32ebb22bd1bb5 Mon Sep 17 00:00:00 2001 From: nyan Date: Fri, 10 Mar 2006 12:18:41 +0000 Subject: Disable an SMP detection on pc98. --- usr.sbin/sade/Makefile | 2 +- usr.sbin/sade/install.c | 2 +- usr.sbin/sysinstall/Makefile | 2 +- usr.sbin/sysinstall/install.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'usr.sbin') 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(); -- cgit v1.1