From fe91068c3c3bc1dee4593840eb4f7e4ca8bb4045 Mon Sep 17 00:00:00 2001 From: Yoshihiro Takahashi Date: Fri, 10 Mar 2006 12:18:41 +0000 Subject: [PATCH] Disable an SMP detection on pc98. --- release/pc98/boot_crunch.conf | 2 +- usr.sbin/sade/Makefile | 2 +- usr.sbin/sade/install.c | 2 +- usr.sbin/sysinstall/Makefile | 2 +- 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 78061ddfd913..b630c887efd5 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 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(); diff --git a/usr.sbin/sysinstall/Makefile b/usr.sbin/sysinstall/Makefile index c735c2695bf8..4c760a2569d3 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 dbd12b0cff99..3ff7d8ec6771 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();