diff --git a/sys/amd64/amd64/support.S b/sys/amd64/amd64/support.S
index 34a5885c80c0..788151c2b966 100644
--- a/sys/amd64/amd64/support.S
+++ b/sys/amd64/amd64/support.S
@@ -706,10 +706,6 @@ ENTRY(generic_copyout)
 
 #if defined(I386_CPU)
 
-#if defined(SMP)
-#error I386_CPU option not supported if SMP
-#endif
-
 #if defined(I486_CPU) || defined(I586_CPU) || defined(I686_CPU)
 	cmpl	$CPUCLASS_386,_cpu_class
 	jne	3f
@@ -1214,10 +1210,6 @@ ENTRY(suword)
 
 #if defined(I386_CPU)
 
-#if defined(SMP)
-#error I386_CPU option not supported if SMP
-#endif
-
 #if defined(I486_CPU) || defined(I586_CPU) || defined(I686_CPU)
 	cmpl	$CPUCLASS_386,_cpu_class
 	jne	2f				/* we only have to set the right segment selector */
@@ -1270,10 +1262,6 @@ ENTRY(susword)
 
 #if defined(I386_CPU)
 
-#if defined(SMP)
-#error I386_CPU option not supported if SMP
-#endif
-
 #if defined(I486_CPU) || defined(I586_CPU) || defined(I686_CPU)
 	cmpl	$CPUCLASS_386,_cpu_class
 	jne	2f
@@ -1327,10 +1315,6 @@ ENTRY(subyte)
 
 #if defined(I386_CPU)
 
-#if defined(SMP)
-#error I386_CPU option not supported if SMP
-#endif
-
 #if defined(I486_CPU) || defined(I586_CPU) || defined(I686_CPU)
 	cmpl	$CPUCLASS_386,_cpu_class
 	jne	2f
diff --git a/sys/amd64/amd64/support.s b/sys/amd64/amd64/support.s
index 34a5885c80c0..788151c2b966 100644
--- a/sys/amd64/amd64/support.s
+++ b/sys/amd64/amd64/support.s
@@ -706,10 +706,6 @@ ENTRY(generic_copyout)
 
 #if defined(I386_CPU)
 
-#if defined(SMP)
-#error I386_CPU option not supported if SMP
-#endif
-
 #if defined(I486_CPU) || defined(I586_CPU) || defined(I686_CPU)
 	cmpl	$CPUCLASS_386,_cpu_class
 	jne	3f
@@ -1214,10 +1210,6 @@ ENTRY(suword)
 
 #if defined(I386_CPU)
 
-#if defined(SMP)
-#error I386_CPU option not supported if SMP
-#endif
-
 #if defined(I486_CPU) || defined(I586_CPU) || defined(I686_CPU)
 	cmpl	$CPUCLASS_386,_cpu_class
 	jne	2f				/* we only have to set the right segment selector */
@@ -1270,10 +1262,6 @@ ENTRY(susword)
 
 #if defined(I386_CPU)
 
-#if defined(SMP)
-#error I386_CPU option not supported if SMP
-#endif
-
 #if defined(I486_CPU) || defined(I586_CPU) || defined(I686_CPU)
 	cmpl	$CPUCLASS_386,_cpu_class
 	jne	2f
@@ -1327,10 +1315,6 @@ ENTRY(subyte)
 
 #if defined(I386_CPU)
 
-#if defined(SMP)
-#error I386_CPU option not supported if SMP
-#endif
-
 #if defined(I486_CPU) || defined(I586_CPU) || defined(I686_CPU)
 	cmpl	$CPUCLASS_386,_cpu_class
 	jne	2f
diff --git a/sys/i386/i386/support.s b/sys/i386/i386/support.s
index 34a5885c80c0..788151c2b966 100644
--- a/sys/i386/i386/support.s
+++ b/sys/i386/i386/support.s
@@ -706,10 +706,6 @@ ENTRY(generic_copyout)
 
 #if defined(I386_CPU)
 
-#if defined(SMP)
-#error I386_CPU option not supported if SMP
-#endif
-
 #if defined(I486_CPU) || defined(I586_CPU) || defined(I686_CPU)
 	cmpl	$CPUCLASS_386,_cpu_class
 	jne	3f
@@ -1214,10 +1210,6 @@ ENTRY(suword)
 
 #if defined(I386_CPU)
 
-#if defined(SMP)
-#error I386_CPU option not supported if SMP
-#endif
-
 #if defined(I486_CPU) || defined(I586_CPU) || defined(I686_CPU)
 	cmpl	$CPUCLASS_386,_cpu_class
 	jne	2f				/* we only have to set the right segment selector */
@@ -1270,10 +1262,6 @@ ENTRY(susword)
 
 #if defined(I386_CPU)
 
-#if defined(SMP)
-#error I386_CPU option not supported if SMP
-#endif
-
 #if defined(I486_CPU) || defined(I586_CPU) || defined(I686_CPU)
 	cmpl	$CPUCLASS_386,_cpu_class
 	jne	2f
@@ -1327,10 +1315,6 @@ ENTRY(subyte)
 
 #if defined(I386_CPU)
 
-#if defined(SMP)
-#error I386_CPU option not supported if SMP
-#endif
-
 #if defined(I486_CPU) || defined(I586_CPU) || defined(I686_CPU)
 	cmpl	$CPUCLASS_386,_cpu_class
 	jne	2f