From: Firoz Khan <firoz.khan@linaro.org>
To: linux-alpha@vger.kernel.org, Richard Henderson <rth@twiddle.net>,
Ivan Kokshaysky <ink@jurassic.park.msu.ru>,
Matt Turner <mattst88@gmail.com>,
Thomas Gleixner <tglx@linutronix.de>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Philippe Ombredanne <pombredanne@nexb.com>,
Kate Stewart <kstewart@linuxfoundation.org>
Cc: y2038@lists.linaro.org, linux-kernel@vger.kernel.org,
linux-arch@vger.kernel.org, arnd@arndb.de,
deepa.kernel@gmail.com, marcin.juszkiewicz@linaro.org,
firoz.khan@linaro.org
Subject: [PATCH v3 2/5] alpha: remove CONFIG_OSF4_COMPAT flag from syscall table
Date: Tue, 13 Nov 2018 15:01:50 +0530 [thread overview]
Message-ID: <1542101513-22010-3-git-send-email-firoz.khan@linaro.org> (raw)
In-Reply-To: <1542101513-22010-1-git-send-email-firoz.khan@linaro.org>
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>
---
arch/alpha/kernel/osf_sys.c | 9 ++++++---
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 cff52d8..4a147bf 100644
--- a/arch/alpha/kernel/osf_sys.c
+++ b/arch/alpha/kernel/osf_sys.c
@@ -1343,7 +1343,6 @@ struct timex32 {
}
#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 @@ struct timex32 {
}
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 5b2e8ec..59ca11d 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
--
1.9.1
next prev parent reply other threads:[~2018-11-13 9:32 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-13 9:31 [PATCH v3 0/5] alpha: system call table generation support Firoz Khan
2018-11-13 9:31 ` [PATCH v3 1/5] alpha: move __IGNORE* entries to non uapi header Firoz Khan
2018-11-13 9:31 ` Firoz Khan [this message]
2018-11-13 9:31 ` [PATCH v3 3/5] alpha: add __NR_syscalls along with NR_SYSCALLS Firoz Khan
2018-11-13 9:31 ` [PATCH v3 4/5] alpha: add system call table generation support Firoz Khan
2018-11-13 9:31 ` [PATCH v3 5/5] alpha: generate uapi header and syscall table header files Firoz Khan
2018-12-14 15:17 ` [PATCH v3 0/5] alpha: system call table generation support Firoz Khan
2018-12-19 15:59 ` Matt Turner
2018-12-19 17:08 ` Arnd Bergmann
2018-12-21 16:46 ` Matt Turner
2018-12-22 10:27 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1542101513-22010-3-git-send-email-firoz.khan@linaro.org \
--to=firoz.khan@linaro.org \
--cc=arnd@arndb.de \
--cc=deepa.kernel@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=ink@jurassic.park.msu.ru \
--cc=kstewart@linuxfoundation.org \
--cc=linux-alpha@vger.kernel.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=marcin.juszkiewicz@linaro.org \
--cc=mattst88@gmail.com \
--cc=pombredanne@nexb.com \
--cc=rth@twiddle.net \
--cc=tglx@linutronix.de \
--cc=y2038@lists.linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).