diff --git a/arch/i386/kernel/entry.S b/arch/i386/kernel/entry.S
index a714d6b43506c957c9527aba9b0525b24ad6f925..290b7bc82da3c91d25c00aee470183f53a99c63c 100644
--- a/arch/i386/kernel/entry.S
+++ b/arch/i386/kernel/entry.S
@@ -1107,6 +1107,6 @@ ENDPROC(xen_failsafe_callback)
 #endif	/* CONFIG_XEN */
 
 .section .rodata,"a"
-#include "syscall_table.S"
+#include "syscall_table_32.S"
 
 syscall_table_size=(.-sys_call_table)
diff --git a/arch/i386/kernel/syscall_table.S b/arch/i386/kernel/syscall_table_32.S
similarity index 100%
rename from arch/i386/kernel/syscall_table.S
rename to arch/i386/kernel/syscall_table_32.S
diff --git a/arch/um/sys-i386/sys_call_table.S b/arch/um/sys-i386/sys_call_table.S
index 2497554b7b9547a7d176d658ae0f490d517d7144..4c1f17d7986d754eeca744b27e82b16bc6684795 100644
--- a/arch/um/sys-i386/sys_call_table.S
+++ b/arch/um/sys-i386/sys_call_table.S
@@ -9,4 +9,4 @@
 
 #define old_mmap old_mmap_i386
 
-#include "../../i386/kernel/syscall_table.S"
+#include "../../i386/kernel/syscall_table_32.S"