diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-29 17:49:45 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-29 17:49:45 -0400 |
commit | 50483c3268918ee51a56d1baa39b9149d2d0d521 (patch) | |
tree | 2fb9c927c319628ebddfd118c10df3e626bdd1c4 /arch/tile/include/asm | |
parent | 7fda0412c5f7afdd1a5ff518f98dee5157266d8a (diff) | |
parent | 1631fcea8399da5e80a80084b3b8c5bfd99d21e7 (diff) |
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 'arch/tile/include/asm')
-rw-r--r-- | arch/tile/include/asm/compat.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/arch/tile/include/asm/compat.h b/arch/tile/include/asm/compat.h index bf95f55b82b0..4b4b28969a65 100644 --- a/arch/tile/include/asm/compat.h +++ b/arch/tile/include/asm/compat.h | |||
@@ -242,17 +242,6 @@ long compat_sys_fallocate(int fd, int mode, | |||
242 | long compat_sys_sched_rr_get_interval(compat_pid_t pid, | 242 | long compat_sys_sched_rr_get_interval(compat_pid_t pid, |
243 | struct compat_timespec __user *interval); | 243 | struct compat_timespec __user *interval); |
244 | 244 | ||
245 | /* Versions of compat functions that differ from generic Linux. */ | ||
246 | struct compat_msgbuf; | ||
247 | long tile_compat_sys_msgsnd(int msqid, | ||
248 | struct compat_msgbuf __user *msgp, | ||
249 | size_t msgsz, int msgflg); | ||
250 | long tile_compat_sys_msgrcv(int msqid, | ||
251 | struct compat_msgbuf __user *msgp, | ||
252 | size_t msgsz, long msgtyp, int msgflg); | ||
253 | long tile_compat_sys_ptrace(compat_long_t request, compat_long_t pid, | ||
254 | compat_long_t addr, compat_long_t data); | ||
255 | |||
256 | /* Tilera Linux syscalls that don't have "compat" versions. */ | 245 | /* Tilera Linux syscalls that don't have "compat" versions. */ |
257 | #define compat_sys_flush_cache sys_flush_cache | 246 | #define compat_sys_flush_cache sys_flush_cache |
258 | 247 | ||