summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorkato <kato@FreeBSD.org>2002-06-25 09:10:38 +0000
committerkato <kato@FreeBSD.org>2002-06-25 09:10:38 +0000
commitd3f2ba39a2c8f77fafe85e07722ae638383df141 (patch)
treef1ecb4f0c434e67e50f22f47c16010261e21dc92 /sys
parent4922dd1ddfa442f2733b0ba7521539360a4dc019 (diff)
downloadFreeBSD-src-d3f2ba39a2c8f77fafe85e07722ae638383df141.zip
FreeBSD-src-d3f2ba39a2c8f77fafe85e07722ae638383df141.tar.gz
MFi386: sys/i386/i386/machdep.c rev. 1.520.
Diffstat (limited to 'sys')
-rw-r--r--sys/pc98/i386/machdep.c6
-rw-r--r--sys/pc98/pc98/machdep.c6
2 files changed, 8 insertions, 4 deletions
diff --git a/sys/pc98/i386/machdep.c b/sys/pc98/i386/machdep.c
index 472789e..be5e247 100644
--- a/sys/pc98/i386/machdep.c
+++ b/sys/pc98/i386/machdep.c
@@ -800,7 +800,11 @@ cpu_halt(void)
* the !SMP case, as there is no clean way to ensure that a CPU will be
* woken when there is work available for it.
*/
+#ifdef SMP
+static int cpu_idle_hlt = 0;
+#else
static int cpu_idle_hlt = 1;
+#endif
SYSCTL_INT(_machdep, OID_AUTO, cpu_idle_hlt, CTLFLAG_RW,
&cpu_idle_hlt, 0, "Idle loop HLT enable");
@@ -813,7 +817,6 @@ SYSCTL_INT(_machdep, OID_AUTO, cpu_idle_hlt, CTLFLAG_RW,
void
cpu_idle(void)
{
-#ifndef SMP
if (cpu_idle_hlt) {
disable_intr();
if (procrunnable()) {
@@ -827,7 +830,6 @@ cpu_idle(void)
__asm __volatile("sti; hlt");
}
}
-#endif
}
/*
diff --git a/sys/pc98/pc98/machdep.c b/sys/pc98/pc98/machdep.c
index 472789e..be5e247 100644
--- a/sys/pc98/pc98/machdep.c
+++ b/sys/pc98/pc98/machdep.c
@@ -800,7 +800,11 @@ cpu_halt(void)
* the !SMP case, as there is no clean way to ensure that a CPU will be
* woken when there is work available for it.
*/
+#ifdef SMP
+static int cpu_idle_hlt = 0;
+#else
static int cpu_idle_hlt = 1;
+#endif
SYSCTL_INT(_machdep, OID_AUTO, cpu_idle_hlt, CTLFLAG_RW,
&cpu_idle_hlt, 0, "Idle loop HLT enable");
@@ -813,7 +817,6 @@ SYSCTL_INT(_machdep, OID_AUTO, cpu_idle_hlt, CTLFLAG_RW,
void
cpu_idle(void)
{
-#ifndef SMP
if (cpu_idle_hlt) {
disable_intr();
if (procrunnable()) {
@@ -827,7 +830,6 @@ cpu_idle(void)
__asm __volatile("sti; hlt");
}
}
-#endif
}
/*
OpenPOWER on IntegriCloud