From: Mark Rutland <mark.rutland@arm.com>
To: linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, will.deacon@arm.com,
catalin.marinas@arm.com
Cc: Mark Rutland <mark.rutland@arm.com>
Subject: [PATCHv2 16/19] arm64: use {COMPAT,}SYSCALL_DEFINE0 for sigreturn
Date: Fri, 1 Jun 2018 12:24:38 +0100 [thread overview]
Message-ID: <20180601112441.37810-17-mark.rutland@arm.com> (raw)
In-Reply-To: <20180601112441.37810-1-mark.rutland@arm.com>
We don't currently annotate our various sigreturn functions as syscalls,
as we need to do to use pt_regs syscall wrappers.
Let's mark them as real syscalls.
For compat_sys_sigreturn and compat_sys_rt_sigreturn, this changes the
return type from int to long, matching the prototypes in sys32.c.
Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
---
arch/arm64/kernel/signal.c | 2 +-
arch/arm64/kernel/signal32.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm64/kernel/signal.c b/arch/arm64/kernel/signal.c
index caa7a68cf2d2..04a26dcbea32 100644
--- a/arch/arm64/kernel/signal.c
+++ b/arch/arm64/kernel/signal.c
@@ -538,7 +538,7 @@ static int restore_sigframe(struct pt_regs *regs,
return err;
}
-asmlinkage long sys_rt_sigreturn(void)
+SYSCALL_DEFINE0(rt_sigreturn)
{
struct pt_regs *regs = current_pt_regs();
struct rt_sigframe __user *frame;
diff --git a/arch/arm64/kernel/signal32.c b/arch/arm64/kernel/signal32.c
index cb10588a7cb2..1948566dcccf 100644
--- a/arch/arm64/kernel/signal32.c
+++ b/arch/arm64/kernel/signal32.c
@@ -282,7 +282,7 @@ static int compat_restore_sigframe(struct pt_regs *regs,
return err;
}
-asmlinkage int compat_sys_sigreturn(void)
+COMPAT_SYSCALL_DEFINE0(sigreturn)
{
struct pt_regs *regs = current_pt_regs();
struct compat_sigframe __user *frame;
@@ -313,7 +313,7 @@ asmlinkage int compat_sys_sigreturn(void)
return 0;
}
-asmlinkage int compat_sys_rt_sigreturn(void)
+COMPAT_SYSCALL_DEFINE0(rt_sigreturn)
{
struct pt_regs *regs = current_pt_regs();
struct compat_rt_sigframe __user *frame;
--
2.11.0
next prev parent reply other threads:[~2018-06-01 11:27 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-01 11:24 [PATCHv2 00/19] arm64: invoke syscalls with pt_regs Mark Rutland
2018-06-01 11:24 ` [PATCHv2 01/19] arm64: consistently use unsigned long for thread flags Mark Rutland
2018-06-01 11:24 ` [PATCHv2 02/19] arm64: move SCTLR_EL{1,2} assertions to <asm/sysreg.h> Mark Rutland
2018-06-14 16:44 ` Will Deacon
2018-06-01 11:24 ` [PATCHv2 03/19] arm64: introduce sysreg_clear_set() Mark Rutland
2018-06-01 11:24 ` [PATCHv2 04/19] arm64: kill config_sctlr_el1() Mark Rutland
2018-06-01 11:24 ` [PATCHv2 05/19] arm64: kill change_cpacr() Mark Rutland
2018-06-01 11:24 ` [PATCHv2 06/19] arm64: move sve_user_{enable,disable} to <asm/fpsimd.h> Mark Rutland
2018-06-01 11:24 ` [PATCHv2 07/19] arm64: remove sigreturn wrappers Mark Rutland
2018-06-01 11:24 ` [PATCHv2 08/19] arm64: convert raw syscall invocation to C Mark Rutland
2018-06-01 11:24 ` [PATCHv2 09/19] arm64: convert syscall trace logic " Mark Rutland
2018-06-01 11:24 ` [PATCHv2 10/19] arm64: convert native/compat syscall entry " Mark Rutland
2018-06-01 11:24 ` [PATCHv2 11/19] arm64: don't reload GPRs after apply_ssbd Mark Rutland
2018-06-01 14:41 ` Marc Zyngier
2018-06-01 11:24 ` [PATCHv2 12/19] arm64: zero GPRs upon entry from EL0 Mark Rutland
2018-06-01 11:24 ` [PATCHv2 13/19] kernel: add ksys_personality() Mark Rutland
2018-06-01 11:24 ` [PATCHv2 14/19] kernel: add kcompat_sys_{f,}statfs64() Mark Rutland
2018-06-01 11:24 ` [PATCHv2 15/19] arm64: remove in-kernel call to sys_personality() Mark Rutland
2018-06-01 11:24 ` Mark Rutland [this message]
2018-06-01 11:24 ` [PATCHv2 17/19] arm64: use SYSCALL_DEFINE6() for mmap Mark Rutland
2018-06-01 11:24 ` [PATCHv2 18/19] arm64: convert compat wrappers to C Mark Rutland
2018-06-01 11:24 ` [PATCHv2 19/19] arm64: implement syscall wrappers Mark Rutland
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=20180601112441.37810-17-mark.rutland@arm.com \
--to=mark.rutland@arm.com \
--cc=catalin.marinas@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=will.deacon@arm.com \
/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
all inboxes | Powered by JetHome®