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>
This commit is contained in:
Firoz Khan 2018-11-13 15:01:50 +05:30 коммит произвёл Matt Turner
Родитель 150fbd536f
Коммит d8bf616be5
2 изменённых файлов: 6 добавлений и 8 удалений

Просмотреть файл

@ -1343,7 +1343,6 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
} }
#ifdef CONFIG_OSF4_COMPAT #ifdef CONFIG_OSF4_COMPAT
/* Clear top 32 bits of iov_len in the user's buffer for /* Clear top 32 bits of iov_len in the user's buffer for
compatibility with old versions of OSF/1 where iov_len compatibility with old versions of OSF/1 where iov_len
was defined as int. */ was defined as int. */
@ -1360,27 +1359,31 @@ osf_fix_iov_len(const struct iovec __user *iov, unsigned long count)
} }
return 0; return 0;
} }
#endif
SYSCALL_DEFINE3(osf_readv, unsigned long, fd, SYSCALL_DEFINE3(osf_readv, unsigned long, fd,
const struct iovec __user *, vector, unsigned long, count) const struct iovec __user *, vector, unsigned long, count)
{ {
#ifdef CONFIG_OSF4_COMPAT
if (unlikely(personality(current->personality) == PER_OSF4)) if (unlikely(personality(current->personality) == PER_OSF4))
if (osf_fix_iov_len(vector, count)) if (osf_fix_iov_len(vector, count))
return -EFAULT; return -EFAULT;
#endif
return sys_readv(fd, vector, count); return sys_readv(fd, vector, count);
} }
SYSCALL_DEFINE3(osf_writev, unsigned long, fd, SYSCALL_DEFINE3(osf_writev, unsigned long, fd,
const struct iovec __user *, vector, unsigned long, count) const struct iovec __user *, vector, unsigned long, count)
{ {
#ifdef CONFIG_OSF4_COMPAT
if (unlikely(personality(current->personality) == PER_OSF4)) if (unlikely(personality(current->personality) == PER_OSF4))
if (osf_fix_iov_len(vector, count)) if (osf_fix_iov_len(vector, count))
return -EFAULT; return -EFAULT;
#endif
return sys_writev(fd, vector, count); return sys_writev(fd, vector, count);
} }
#endif
SYSCALL_DEFINE2(osf_getpriority, int, which, int, who) SYSCALL_DEFINE2(osf_getpriority, int, which, int, who)
{ {
int prio = sys_getpriority(which, who); int prio = sys_getpriority(which, who);

Просмотреть файл

@ -132,13 +132,8 @@ sys_call_table:
.quad sys_osf_getrusage .quad sys_osf_getrusage
.quad sys_getsockopt .quad sys_getsockopt
.quad sys_ni_syscall .quad sys_ni_syscall
#ifdef CONFIG_OSF4_COMPAT
.quad sys_osf_readv /* 120 */ .quad sys_osf_readv /* 120 */
.quad sys_osf_writev .quad sys_osf_writev
#else
.quad sys_readv /* 120 */
.quad sys_writev
#endif
.quad sys_osf_settimeofday .quad sys_osf_settimeofday
.quad sys_fchown .quad sys_fchown
.quad sys_fchmod .quad sys_fchmod