diff options
| author | Firoz Khan <firoz.khan@linaro.org> | 2018-11-13 12:31:50 +0300 |
|---|---|---|
| committer | Matt Turner <mattst88@gmail.com> | 2018-12-21 19:57:56 +0300 |
| commit | d8bf616be5f05b955d3ee32ad92d4cdb87e30349 (patch) | |
| tree | 3820eadb2b87b40b82f6f3c497910ea196aaaf81 /arch/alpha | |
| parent | 150fbd536f9eb3044c2b048dc13ee648a78afb93 (diff) | |
| download | linux-d8bf616be5f05b955d3ee32ad92d4cdb87e30349.tar.xz | |
alpha: remove CONFIG_OSF4_COMPAT flag from syscall table
Remove CONFIG_OSF4_COMPAT config flag from system call
table - systbls.S and to keep the same feature, add the
flag in osf_sys.c.
One of the patch in this patch series will generate the
system call table file. In order to come up with a common
implementation across all architecture, we need this change.
Signed-off-by: Firoz Khan <firoz.khan@linaro.org>
Signed-off-by: Matt Turner <mattst88@gmail.com>
Diffstat (limited to 'arch/alpha')
| -rw-r--r-- | arch/alpha/kernel/osf_sys.c | 9 | ||||
| -rw-r--r-- | arch/alpha/kernel/systbls.S | 5 |
2 files changed, 6 insertions, 8 deletions
diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c index cff52d8ffdb1..4a147bf8537a 100644 --- a/arch/alpha/kernel/osf_sys.c +++ b/arch/alpha/kernel/osf_sys.c @@ -1343,7 +1343,6 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr, } #ifdef CONFIG_OSF4_COMPAT - /* Clear top 32 bits of iov_len in the user's buffer for compatibility with old versions of OSF/1 where iov_len was defined as int. */ @@ -1360,27 +1359,31 @@ osf_fix_iov_len(const struct iovec __user *iov, unsigned long count) } return 0; } +#endif SYSCALL_DEFINE3(osf_readv, unsigned long, fd, const struct iovec __user *, vector, unsigned long, count) { +#ifdef CONFIG_OSF4_COMPAT if (unlikely(personality(current->personality) == PER_OSF4)) if (osf_fix_iov_len(vector, count)) return -EFAULT; +#endif + return sys_readv(fd, vector, count); } SYSCALL_DEFINE3(osf_writev, unsigned long, fd, const struct iovec __user *, vector, unsigned long, count) { +#ifdef CONFIG_OSF4_COMPAT if (unlikely(personality(current->personality) == PER_OSF4)) if (osf_fix_iov_len(vector, count)) return -EFAULT; +#endif return sys_writev(fd, vector, count); } -#endif - SYSCALL_DEFINE2(osf_getpriority, int, which, int, who) { int prio = sys_getpriority(which, who); diff --git a/arch/alpha/kernel/systbls.S b/arch/alpha/kernel/systbls.S index 5b2e8ecb7ce3..59ca11d16aaf 100644 --- a/arch/alpha/kernel/systbls.S +++ b/arch/alpha/kernel/systbls.S @@ -132,13 +132,8 @@ sys_call_table: .quad sys_osf_getrusage .quad sys_getsockopt .quad sys_ni_syscall -#ifdef CONFIG_OSF4_COMPAT .quad sys_osf_readv /* 120 */ .quad sys_osf_writev -#else - .quad sys_readv /* 120 */ - .quad sys_writev -#endif .quad sys_osf_settimeofday .quad sys_fchown .quad sys_fchmod |