aboutsummaryrefslogtreecommitdiff
path: root/arch/tile/include/asm/compat.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-03-08 14:46:04 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2013-03-08 14:46:04 -0800
commitc4c5ff09872751eeb412e3e1af484955529426a1 (patch)
tree3eeaf398043ab6ff3fa7b1b43f30ba9c793dd48d /arch/tile/include/asm/compat.h
parent92e840b84e75cd662d7e992711e1d073295c9b47 (diff)
parent87c319a2c3c2efd397281089b9cdce3050febeff (diff)
downloadlinaro-lsk-c4c5ff09872751eeb412e3e1af484955529426a1.tar.gz
Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
Pull tile architecture fixes from Chris Metcalf: "This fixes the bug that Al Viro spotted with the compat llseek code. I also fixed the compat syscall definitions to use the new syscall define macros to properly sign-extend their arguments." * 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile: tile: properly use COMPAT_SYSCALL_DEFINEx tile: work around bug in the generic sys_llseek
Diffstat (limited to 'arch/tile/include/asm/compat.h')
-rw-r--r--arch/tile/include/asm/compat.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/tile/include/asm/compat.h b/arch/tile/include/asm/compat.h
index 001d418a895..78f1f2ded86 100644
--- a/arch/tile/include/asm/compat.h
+++ b/arch/tile/include/asm/compat.h
@@ -288,6 +288,9 @@ long compat_sys_sync_file_range2(int fd, unsigned int flags,
long compat_sys_fallocate(int fd, int mode,
u32 offset_lo, u32 offset_hi,
u32 len_lo, u32 len_hi);
+long compat_sys_llseek(unsigned int fd, unsigned int offset_high,
+ unsigned int offset_low, loff_t __user * result,
+ unsigned int origin);
/* Assembly trampoline to avoid clobbering r0. */
long _compat_sys_rt_sigreturn(void);