diff --git a/arch/x86/entry/Makefile b/arch/x86/entry/Makefile
index b93cce1c6bb2e23bbc6ad3dd4d2d039bde386f8c..7a144971db7905689a825d4fa58aea2cb7c246b3 100644
--- a/arch/x86/entry/Makefile
+++ b/arch/x86/entry/Makefile
@@ -6,5 +6,5 @@ obj-y				:= entry_$(BITS).o thunk_$(BITS).o syscall_$(BITS).o
 obj-y				+= vdso/
 obj-y				+= vsyscall/
 
-obj-$(CONFIG_IA32_EMULATION)	+= ia32entry.o syscall_32.o
+obj-$(CONFIG_IA32_EMULATION)	+= entry_64_compat.o syscall_32.o
 
diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S
index 31770662b94072db62559260a78e7851f02c4403..4cf3dd36aa0d3759760acf95f37ff88df90d832d 100644
--- a/arch/x86/entry/entry_64.S
+++ b/arch/x86/entry/entry_64.S
@@ -516,7 +516,7 @@ ENTRY(ret_from_fork)
 	/*
 	 * By the time we get here, we have no idea whether our pt_regs,
 	 * ti flags, and ti status came from the 64-bit SYSCALL fast path,
-	 * the slow path, or one of the ia32entry paths.
+	 * the slow path, or one of the 32-bit compat paths.
 	 * Use IRET code path to return, since it can safely handle
 	 * all of the above.
 	 */
diff --git a/arch/x86/entry/ia32entry.S b/arch/x86/entry/entry_64_compat.S
similarity index 100%
rename from arch/x86/entry/ia32entry.S
rename to arch/x86/entry/entry_64_compat.S