Merge branch 'master'

2 files changed, 5 insertions, 1 deletions

diff --git a/arch/i386/kernel/head.S b/arch/i386/kernel/head.S
index 5884469f6bfe..2bee6499edd9 100644
--- a/arch/i386/kernel/head.S
+++ b/arch/i386/kernel/head.S
@@ -398,7 +398,11 @@ ignore_int:
         pushl 32(%esp)
         pushl 40(%esp)
         pushl $int_msg
+#ifdef CONFIG_EARLY_PRINTK
+        call early_printk
+#else
         call printk
+#endif
         addl $(5*4),%esp
         popl %ds
         popl %es
diff --git a/arch/i386/kernel/syscall_table.S b/arch/i386/kernel/syscall_table.S
index 5a8b3fb6d27b..ac687d00a1ce 100644
--- a/arch/i386/kernel/syscall_table.S
+++ b/arch/i386/kernel/syscall_table.S
@@ -299,7 +299,7 @@ ENTRY(sys_call_table)
         .long sys_mknodat
         .long sys_fchownat
         .long sys_futimesat
-        .long sys_newfstatat            /* 300 */
+        .long sys_fstatat64             /* 300 */
         .long sys_unlinkat
         .long sys_renameat
         .long sys_linkat