diff options
author | Catalin Marinas <catalin.marinas@arm.com> | 2012-10-03 06:20:20 -0400 |
---|---|---|
committer | Catalin Marinas <catalin.marinas@arm.com> | 2012-10-08 11:03:42 -0400 |
commit | e048d004a5392e3d6d78b0a53335391f87d724ec (patch) | |
tree | fe5d9c33f6aeb590f69f40403cec160e7358ec9c /arch/arm64 | |
parent | 27222a3d2bbb40f80af6abf0cefea1b27125409e (diff) |
arm64: Use the generic compat_sys_sendfile() implementation
The generic implementation of compat_sys_sendfile() has been introduced
by commit 8f9c0119. This patch removes the arm64 implementation in
favour of the generic one.
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'arch/arm64')
-rw-r--r-- | arch/arm64/include/asm/unistd32.h | 1 | ||||
-rw-r--r-- | arch/arm64/kernel/sys_compat.c | 20 |
2 files changed, 1 insertions, 20 deletions
diff --git a/arch/arm64/include/asm/unistd32.h b/arch/arm64/include/asm/unistd32.h index 3ba1f1a90629..ba42d41fc5c2 100644 --- a/arch/arm64/include/asm/unistd32.h +++ b/arch/arm64/include/asm/unistd32.h | |||
@@ -752,3 +752,4 @@ __SYSCALL(__NR_syncfs, sys_syncfs) | |||
752 | #define __ARCH_WANT_SYS_SIGPENDING | 752 | #define __ARCH_WANT_SYS_SIGPENDING |
753 | #define __ARCH_WANT_SYS_SIGPROCMASK | 753 | #define __ARCH_WANT_SYS_SIGPROCMASK |
754 | #define __ARCH_WANT_COMPAT_SYS_RT_SIGSUSPEND | 754 | #define __ARCH_WANT_COMPAT_SYS_RT_SIGSUSPEND |
755 | #define __ARCH_WANT_COMPAT_SYS_SENDFILE | ||
diff --git a/arch/arm64/kernel/sys_compat.c b/arch/arm64/kernel/sys_compat.c index 967e92fdff01..93f10e27dc79 100644 --- a/arch/arm64/kernel/sys_compat.c +++ b/arch/arm64/kernel/sys_compat.c | |||
@@ -84,26 +84,6 @@ asmlinkage int compat_sys_sched_rr_get_interval(compat_pid_t pid, | |||
84 | return ret; | 84 | return ret; |
85 | } | 85 | } |
86 | 86 | ||
87 | asmlinkage int compat_sys_sendfile(int out_fd, int in_fd, | ||
88 | compat_off_t __user *offset, s32 count) | ||
89 | { | ||
90 | mm_segment_t old_fs = get_fs(); | ||
91 | int ret; | ||
92 | off_t of; | ||
93 | |||
94 | if (offset && get_user(of, offset)) | ||
95 | return -EFAULT; | ||
96 | |||
97 | set_fs(KERNEL_DS); | ||
98 | ret = sys_sendfile(out_fd, in_fd, offset ? (off_t __user *)&of : NULL, | ||
99 | count); | ||
100 | set_fs(old_fs); | ||
101 | |||
102 | if (offset && put_user(of, offset)) | ||
103 | return -EFAULT; | ||
104 | return ret; | ||
105 | } | ||
106 | |||
107 | static inline void | 87 | static inline void |
108 | do_compat_cache_op(unsigned long start, unsigned long end, int flags) | 88 | do_compat_cache_op(unsigned long start, unsigned long end, int flags) |
109 | { | 89 | { |