diff --git a/[refs] b/[refs]
index cdba17580dbf..95e730a0ca89 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5250d969f281b9f1ca581245a8797a5b7055c959
+refs/heads/master: 541054d935a1ec89916977cbf0d16ddb71b3ff5c
diff --git a/trunk/arch/i386/kernel/entry.S b/trunk/arch/i386/kernel/entry.S
index a714d6b43506..290b7bc82da3 100644
--- a/trunk/arch/i386/kernel/entry.S
+++ b/trunk/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/trunk/arch/i386/kernel/syscall_table.S b/trunk/arch/i386/kernel/syscall_table_32.S
similarity index 100%
rename from trunk/arch/i386/kernel/syscall_table.S
rename to trunk/arch/i386/kernel/syscall_table_32.S
diff --git a/trunk/arch/um/sys-i386/sys_call_table.S b/trunk/arch/um/sys-i386/sys_call_table.S
index 2497554b7b95..4c1f17d7986d 100644
--- a/trunk/arch/um/sys-i386/sys_call_table.S
+++ b/trunk/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"