diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-13 05:12:09 (GMT) |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-13 05:12:09 (GMT) |
| commit | f1b318793dcd2d9ff6b5ac06e7762098fa079cee (patch) | |
| tree | 41ace7a3e453b82776b9f2a1d3b670b6afe5aa59 /arch/i386 | |
| parent | 49430f97dd952eda60848bf6bf161b4917ba103d (diff) | |
| parent | e9bb4c9929a63b23dcc637fae312b36b038bdc61 (diff) | |
| download | linux-fsl-qoriq-f1b318793dcd2d9ff6b5ac06e7762098fa079cee.tar.xz | |
Merge branch 'master'
Diffstat (limited to 'arch/i386')
| -rw-r--r-- | arch/i386/kernel/head.S | 4 | ||||
| -rw-r--r-- | arch/i386/kernel/syscall_table.S | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/arch/i386/kernel/head.S b/arch/i386/kernel/head.S index 5884469..2bee649 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 5a8b3fb..ac687d0 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 |