From: Brian Gerst <brgerst@gmail.com>
To: linux-kernel@vger.kernel.org, x86@kernel.org
Cc: Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@kernel.org>, Borislav Petkov <bp@alien8.de>,
"H . Peter Anvin" <hpa@zytor.com>,
Andy Lutomirski <luto@kernel.org>, Christoph Hellwig <hch@lst.de>,
Arnd Bergmann <arnd@arndb.de>, Brian Gerst <brgerst@gmail.com>
Subject: [PATCH 2/2] x86/x32: Convert x32_rt_sigreturn to native syscall
Date: Tue, 16 Jun 2020 10:23:15 -0400 [thread overview]
Message-ID: <20200616142315.375918-3-brgerst@gmail.com> (raw)
In-Reply-To: <20200616142315.375918-1-brgerst@gmail.com>
x32_rt_sigreturn doesn't need to be a compat syscall because there aren't two
versions.
Signed-off-by: Brian Gerst <brgerst@gmail.com>
---
arch/x86/entry/syscalls/syscall_64.tbl | 2 +-
arch/x86/kernel/signal.c | 2 +-
tools/perf/arch/x86/entry/syscalls/syscall_64.tbl | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/x86/entry/syscalls/syscall_64.tbl b/arch/x86/entry/syscalls/syscall_64.tbl
index 78847b32e137..5fb63ac69971 100644
--- a/arch/x86/entry/syscalls/syscall_64.tbl
+++ b/arch/x86/entry/syscalls/syscall_64.tbl
@@ -368,7 +368,7 @@
# is defined.
#
512 x32 rt_sigaction compat_sys_rt_sigaction
-513 x32 rt_sigreturn compat_sys_x32_rt_sigreturn
+513 x32 rt_sigreturn sys_x32_rt_sigreturn
514 x32 ioctl compat_sys_ioctl
515 x32 readv compat_sys_readv
516 x32 writev compat_sys_writev
diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c
index 399f97abee02..8a3d1cd4ea70 100644
--- a/arch/x86/kernel/signal.c
+++ b/arch/x86/kernel/signal.c
@@ -856,7 +856,7 @@ void signal_fault(struct pt_regs *regs, void __user *frame, char *where)
}
#ifdef CONFIG_X86_X32_ABI
-COMPAT_SYSCALL_DEFINE0(x32_rt_sigreturn)
+SYSCALL_DEFINE0(x32_rt_sigreturn)
{
struct pt_regs *regs = current_pt_regs();
struct rt_sigframe_x32 __user *frame;
diff --git a/tools/perf/arch/x86/entry/syscalls/syscall_64.tbl b/tools/perf/arch/x86/entry/syscalls/syscall_64.tbl
index 37b844f839bc..36a3c8a913da 100644
--- a/tools/perf/arch/x86/entry/syscalls/syscall_64.tbl
+++ b/tools/perf/arch/x86/entry/syscalls/syscall_64.tbl
@@ -367,7 +367,7 @@
# is defined.
#
512 x32 rt_sigaction compat_sys_rt_sigaction
-513 x32 rt_sigreturn compat_sys_x32_rt_sigreturn
+513 x32 rt_sigreturn sys_x32_rt_sigreturn
514 x32 ioctl compat_sys_ioctl
515 x32 readv compat_sys_readv
516 x32 writev compat_sys_writev
--
2.26.2
next prev parent reply other threads:[~2020-06-16 14:23 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-16 14:23 [PATCH 0/2] X32 syscall cleanups Brian Gerst
2020-06-16 14:23 ` [PATCH 1/2] x86/x32: Use __x64 prefix for X32 compat syscalls Brian Gerst
2020-06-16 16:49 ` Andy Lutomirski
2020-06-16 17:17 ` Brian Gerst
2020-06-23 20:49 ` hpa
2020-06-16 14:23 ` Brian Gerst [this message]
2020-07-14 6:40 ` [PATCH 0/2] X32 syscall cleanups Christoph Hellwig
2020-07-14 17:02 ` Brian Gerst
2020-07-14 17:41 ` Andy Lutomirski
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=20200616142315.375918-3-brgerst@gmail.com \
--to=brgerst@gmail.com \
--cc=arnd@arndb.de \
--cc=bp@alien8.de \
--cc=hch@lst.de \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@kernel.org \
--cc=mingo@kernel.org \
--cc=tglx@linutronix.de \
--cc=x86@kernel.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).