diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-02 11:34:06 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-02 11:34:06 -0500 |
| commit | 14cc0b55b70e297a4b5411733d58c6cdc2d7f1be (patch) | |
| tree | 2aa0fe9d267d5ae1ab1b47a67d31fbbc1dbf928e /arch/mips | |
| parent | 3cfb07743a5bffecba83f0da26444e85c0a9bfbb (diff) | |
| parent | 0e803bafbb7d1b8a9031104f1a982a01b45da4c6 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal
Pull signal/compat fixes from Al Viro:
"Fixes for several regressions introduced in the last signal.git pile,
along with fixing bugs in truncate and ftruncate compat (on just about
anything biarch at least one of those two had been done wrong)."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal:
compat: restore timerfd settime and gettime compat syscalls
[regression] braino in "sparc: convert to ksignal"
fix compat truncate/ftruncate
switch lseek to COMPAT_SYSCALL_DEFINE
lseek() and truncate() on sparc really need sign extension
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/kernel/scall64-o32.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S index 402d7469e1a0..af8887f779f1 100644 --- a/arch/mips/kernel/scall64-o32.S +++ b/arch/mips/kernel/scall64-o32.S | |||
| @@ -284,8 +284,8 @@ sys_call_table: | |||
| 284 | PTR compat_sys_old_readdir | 284 | PTR compat_sys_old_readdir |
| 285 | PTR sys_mips_mmap /* 4090 */ | 285 | PTR sys_mips_mmap /* 4090 */ |
| 286 | PTR sys_munmap | 286 | PTR sys_munmap |
| 287 | PTR sys_truncate | 287 | PTR compat_sys_truncate |
| 288 | PTR sys_ftruncate | 288 | PTR compat_sys_ftruncate |
| 289 | PTR sys_fchmod | 289 | PTR sys_fchmod |
| 290 | PTR sys_fchown /* 4095 */ | 290 | PTR sys_fchown /* 4095 */ |
| 291 | PTR sys_getpriority | 291 | PTR sys_getpriority |