commit 883420f4201f50dc91b3d2fefe5cc2837565dc7b
Author: Etienne Brateau <etienne.brateau@gmail.com>
Date:   Mon Apr 7 22:11:26 2025 +0200

    x86_64: update ifdef to exclude the x86_64 for i386 only specific conditions
    
    Message-ID: <20250407201126.1553736-1-etienne.brateau@gmail.com>

diff --git a/i386/i386/trap.c b/i386/i386/trap.c
index a9d0d8d2..90650b31 100644
--- a/i386/i386/trap.c
+++ b/i386/i386/trap.c
@@ -236,7 +236,7 @@ dump_ss(regs);
 		 */
 		result = vm_fault(map,
 				  trunc_page((vm_offset_t)subcode),
-#if !(__i486__ || __i586__ || __i686__)
+#if (__i386__ && !(__i486__ || __i586__ || __i686__))
 				  VM_PROT_READ|VM_PROT_WRITE,
 #else
 				  (code & T_PF_WRITE)
@@ -258,7 +258,7 @@ dump_ss(regs);
 		}
 		else
 #endif	/* MACH_KDB */
-#if !(__i486__ || __i586__ || __i686__)
+#if (__i386__ && !(__i486__ || __i586__ || __i686__))
 		if ((code & T_PF_WRITE) == 0 &&
 		    result == KERN_PROTECTION_FAILURE)
 		{
diff --git a/i386/intel/pmap.c b/i386/intel/pmap.c
index 49ffd579..fa0f4d29 100644
--- a/i386/intel/pmap.c
+++ b/i386/intel/pmap.c
@@ -1973,7 +1973,7 @@ void pmap_protect(
 		return;
 	}
 
-#if !(__i486__ || __i586__ || __i686__)
+#if (__i386__ && !(__i486__ || __i586__ || __i686__))
 	/*
 	 * If write-protecting in the kernel pmap,
 	 * remove the mappings; the i386 ignores
@@ -2188,7 +2188,7 @@ void pmap_enter(
 
 	if (pmap == kernel_pmap && (v < kernel_virtual_start || v >= kernel_virtual_end))
 		panic("pmap_enter(%lx, %llx) falls in physical memory area!\n", (unsigned long) v, (unsigned long long) pa);
-#if !(__i486__ || __i586__ || __i686__)
+#if (__i386__ && !(__i486__ || __i586__ || __i686__))
 	if (pmap == kernel_pmap && (prot & VM_PROT_WRITE) == 0
 	    && !wired /* hack for io_wire */ ) {
 	    /*
diff --git a/i386/intel/read_fault.c b/i386/intel/read_fault.c
index 356145e1..8ff64bbe 100644
--- a/i386/intel/read_fault.c
+++ b/i386/intel/read_fault.c
@@ -33,7 +33,7 @@
 
 #include <kern/macros.h>
 
-#if !(__i486__ || __i586__ || __i686__)
+#if (__i386__ && !(__i486__ || __i586__ || __i686__))
 /*
  *	Expansion of vm_fault for read fault in kernel mode.
  *	Must enter the mapping as writable, since the i386
