Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
Merge commit. Changes below are compared with the first parent: ae000eec.
Changes
1 files changed · +1 −1
| File | Status | Add | Del | Content |
|---|---|---|---|---|
| arch/mips/kernel/scall64-o32.S | modified | +1 | −1 | View file |
arch/mips/kernel/scall64-o32.S
View filediff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S
index b3ed731..dd68afc 100644
--- a/arch/mips/kernel/scall64-o32.S
+++ b/arch/mips/kernel/scall64-o32.S
@@ -525,5 +525,5 @@ sys_call_table:
PTR compat_sys_signalfd
PTR compat_sys_timerfd
PTR sys_eventfd
- PTR sys_fallocate /* 4320 */
+ PTR sys32_fallocate /* 4320 */
.size sys_call_table,.-sys_call_table