diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-29 23:49:45 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-29 23:49:45 +0200 |
| commit | 50483c3268918ee51a56d1baa39b9149d2d0d521 (patch) | |
| tree | 2fb9c927c319628ebddfd118c10df3e626bdd1c4 /include/asm-generic | |
| parent | Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/k... (diff) | |
| parent | compat: use sys_sendfile64() implementation for sendfile syscall (diff) | |
| download | linux-50483c3268918ee51a56d1baa39b9149d2d0d521.tar.xz linux-50483c3268918ee51a56d1baa39b9149d2d0d521.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
Pull arch/tile (really asm-generic) update from Chris Metcalf:
"These are a couple of asm-generic changes that apply to tile."
* git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
compat: use sys_sendfile64() implementation for sendfile syscall
[PATCH v3] ipc: provide generic compat versions of IPC syscalls
Diffstat (limited to 'include/asm-generic')
| -rw-r--r-- | include/asm-generic/unistd.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-generic/unistd.h b/include/asm-generic/unistd.h index 2292d1af9d70..991ef01cd77e 100644 --- a/include/asm-generic/unistd.h +++ b/include/asm-generic/unistd.h @@ -218,7 +218,7 @@ __SC_COMP(__NR_pwritev, sys_pwritev, compat_sys_pwritev) /* fs/sendfile.c */ #define __NR3264_sendfile 71 -__SC_3264(__NR3264_sendfile, sys_sendfile64, sys_sendfile) +__SYSCALL(__NR3264_sendfile, sys_sendfile64) /* fs/select.c */ #define __NR_pselect6 72 |