aboutsummaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorJohn Baldwin <jhb@FreeBSD.org>2000-09-07 16:10:02 +0000
committerJohn Baldwin <jhb@FreeBSD.org>2000-09-07 16:10:02 +0000
commit746a93547452a1a273f7cbf740cc3f65f0b15996 (patch)
treef51e71e34f8d77a77f5a698e70bb0448517a9b56 /sys
parentc0953990e05140bb2809e2cf509043dcd5792c87 (diff)
downloadsrc-746a93547452a1a273f7cbf740cc3f65f0b15996.tar.gz
src-746a93547452a1a273f7cbf740cc3f65f0b15996.zip
Test for both SMP and I386_CPU being set before generating an error.
Notes
Notes: svn path=/head/; revision=65575
Diffstat (limited to 'sys')
-rw-r--r--sys/amd64/include/smp.h2
-rw-r--r--sys/i386/include/smp.h2
-rw-r--r--sys/sys/smp.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/sys/amd64/include/smp.h b/sys/amd64/include/smp.h
index 20d4fa3a8873..59dcb161555c 100644
--- a/sys/amd64/include/smp.h
+++ b/sys/amd64/include/smp.h
@@ -15,7 +15,7 @@
#ifdef _KERNEL
-#ifdef I386_CPU
+#if defined(SMP) && defined(I386_CPU)
#error SMP not supported with I386_CPU
#endif
#if defined(SMP) && !defined(APIC_IO)
diff --git a/sys/i386/include/smp.h b/sys/i386/include/smp.h
index 20d4fa3a8873..59dcb161555c 100644
--- a/sys/i386/include/smp.h
+++ b/sys/i386/include/smp.h
@@ -15,7 +15,7 @@
#ifdef _KERNEL
-#ifdef I386_CPU
+#if defined(SMP) && defined(I386_CPU)
#error SMP not supported with I386_CPU
#endif
#if defined(SMP) && !defined(APIC_IO)
diff --git a/sys/sys/smp.h b/sys/sys/smp.h
index 20d4fa3a8873..59dcb161555c 100644
--- a/sys/sys/smp.h
+++ b/sys/sys/smp.h
@@ -15,7 +15,7 @@
#ifdef _KERNEL
-#ifdef I386_CPU
+#if defined(SMP) && defined(I386_CPU)
#error SMP not supported with I386_CPU
#endif
#if defined(SMP) && !defined(APIC_IO)