Index: kernel/arch/ia32/src/cpu/cpu.c
===================================================================
--- kernel/arch/ia32/src/cpu/cpu.c	(revision 4eb260ab60a00c20027f2d5b08e5c35bf7f21b58)
+++ kernel/arch/ia32/src/cpu/cpu.c	(revision 4bb7ffef3e23c7aa82199ac6ba9838b10a2ceea7)
@@ -118,9 +118,11 @@
 		);
 	}
-	
+
+#ifndef PROCESSOR_i486
 	if (CPU->arch.fi.bits.sep) {
 		/* Setup fast SYSENTER/SYSEXIT syscalls */
 		syscall_setup_cpu();
 	}
+#endif
 }
 
