diff options
| author | Ralf Baechle | 2014-08-02 00:07:03 +0200 |
|---|---|---|
| committer | Ralf Baechle | 2014-08-02 00:07:03 +0200 |
| commit | 475d5928b79bb78326a645863d46ff95c5e25e5a (patch) | |
| tree | a260aed0d94bda824d7f2c5d74b2b1f8002634aa /arch/mips/kernel/scall64-n32.S | |
| parent | MIPS: jz4740: remove unnecessary null test before debugfs_remove (diff) | |
| parent | MIPS: bugfix: missed cache flush of TLB refill handler (diff) | |
| download | kernel-qcow2-linux-475d5928b79bb78326a645863d46ff95c5e25e5a.tar.gz kernel-qcow2-linux-475d5928b79bb78326a645863d46ff95c5e25e5a.tar.xz kernel-qcow2-linux-475d5928b79bb78326a645863d46ff95c5e25e5a.zip | |
Merge branch '3.16-fixes' into mips-for-linux-next
Diffstat (limited to 'arch/mips/kernel/scall64-n32.S')
| -rw-r--r-- | arch/mips/kernel/scall64-n32.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S index 7641c87be99a..03dec5ae11ba 100644 --- a/arch/mips/kernel/scall64-n32.S +++ b/arch/mips/kernel/scall64-n32.S @@ -162,7 +162,7 @@ EXPORT(sysn32_call_table) PTR sys_getpeername PTR sys_socketpair PTR compat_sys_setsockopt - PTR sys_getsockopt + PTR compat_sys_getsockopt PTR __sys_clone /* 6055 */ PTR __sys_fork PTR compat_sys_execve |