@@ -1349,7 +1349,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. */
@@ -1366,27 +1365,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);
@@ -132,13 +132,8 @@ sys_call_table:
.quad sys_osf_getrusage
.quad sys_getsockopt
.quad alpha_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
Removed the CONFIG_OSF4_COMPAT check from systbls.S and kept it in osf_sys.c, so it will provide the same system call support. To do so, we can keep a generic formatted system call table file across all architectures. Signed-off-by: Firoz Khan <firoz.khan@linaro.org> --- arch/alpha/kernel/osf_sys.c | 9 ++++++--- arch/alpha/kernel/systbls.S | 5 ----- 2 files changed, 6 insertions(+), 8 deletions(-) -- 2.7.4