Index: kernel/arch/ia32/Makefile.inc
===================================================================
--- kernel/arch/ia32/Makefile.inc	(revision ac7f81d7ebec01bd079fe1251f6be26b48b73a44)
+++ kernel/arch/ia32/Makefile.inc	(revision 1c99eae3ddfff6466688b16a6f921dfb99e466e6)
@@ -44,4 +44,8 @@
 #
 
+ifeq ($(PROCESSOR),i486)
+	CMN2 = -march=i486
+endif
+
 ifeq ($(PROCESSOR),athlon_xp)
 	CMN2 = -march=athlon-xp
@@ -62,8 +66,4 @@
 	CMN2 = -march=pentium4
 	SUNCC_CFLAGS += -xarch=sse2
-endif
-
-ifeq ($(PROCESSOR),i486)
-	CMN2 = -march=i486
 endif
 
Index: kernel/arch/ia32/include/asm.h
===================================================================
--- kernel/arch/ia32/include/asm.h	(revision ac7f81d7ebec01bd079fe1251f6be26b48b73a44)
+++ kernel/arch/ia32/include/asm.h	(revision 1c99eae3ddfff6466688b16a6f921dfb99e466e6)
@@ -312,4 +312,5 @@
 
 #ifndef PROCESSOR_i486
+
 /** Write to MSR */
 NO_TRACE static inline void write_msr(uint32_t msr, uint64_t value)
@@ -336,5 +337,6 @@
 	return ((uint64_t) dx << 32) | ax;
 }
-#endif
+
+#endif /* PROCESSOR_i486 */
 
 
Index: kernel/arch/ia32/src/asm.S
===================================================================
--- kernel/arch/ia32/src/asm.S	(revision ac7f81d7ebec01bd079fe1251f6be26b48b73a44)
+++ kernel/arch/ia32/src/asm.S	(revision 1c99eae3ddfff6466688b16a6f921dfb99e466e6)
@@ -407,6 +407,6 @@
 #ifdef PROCESSOR_i486
 	jz 0f
-	movl %eax, %ebp
-0:
+		movl %eax, %ebp
+	0:
 #else
 	cmovnzl %eax, %ebp
Index: kernel/arch/ia32/src/syscall.c
===================================================================
--- kernel/arch/ia32/src/syscall.c	(revision ac7f81d7ebec01bd079fe1251f6be26b48b73a44)
+++ kernel/arch/ia32/src/syscall.c	(revision 1c99eae3ddfff6466688b16a6f921dfb99e466e6)
@@ -40,4 +40,5 @@
 
 #ifndef PROCESSOR_i486
+
 /** Enable & setup support for SYSENTER/SYSEXIT */
 void syscall_setup_cpu(void)
@@ -50,5 +51,6 @@
 	write_msr(IA32_MSR_SYSENTER_EIP, (uint32_t) sysenter_handler);
 }
-#endif
+
+#endif /* PROCESSOR_i486 */
 
 /** @}