From patchwork Wed Jul 11 13:56:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Rutland X-Patchwork-Id: 141756 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp321981ljj; Wed, 11 Jul 2018 06:58:11 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfyy2tFNUTn6Ly/b5zSJLFiIy60+ii6QKw2dkgAP6f1+kloO2jkOgPPtjgtg7OtM7TLJV5l X-Received: by 2002:a17:902:7c8b:: with SMTP id y11-v6mr28121777pll.222.1531317491486; Wed, 11 Jul 2018 06:58:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531317491; cv=none; d=google.com; s=arc-20160816; b=afG+jvs4WrEezx5AwLjCYlMYpi6R4ankTggg59G7tNRqcG+BVUo9H61ZtCHAzrZzSK am7vvFLHXLidh8X3QGV87Hrs+YNVinqXe1wLxuRKXA3jADfERl8D7hbZ3/6s3i6Bm8VF l+wcWPhjq65EvOabt5Rc2P3SbWhxmih5g1ispJHYe6Ouasu1/1NncXDUJXBMzGnlHisY CIA1Z/ugTWvWoNoqYpYDXnmUPrwLyGnrI9flT1cy9Esfimb9z+4FL79lU5nHrGgBlr6U 8pc2Z+Sh2NJrMC5xQp7ewYDJZV5t0zIEP53DW96bT5MbbPPKYhXRoz1vhM5audE1jPHF X+JA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=dNZTG/yjSHgfmqGyppguNX2LFtvIHMlmBGfddDd3lvM=; b=EaeQ+p0GPRFyOakxHj9vrV+3GZzgJ0bvUrKAZnSjpTgYgPgxxygGGXYJkc3pZFezUz 3cwxRDZXI1tYMq5azLUs7PbJNsXaW27SN75CToscbNGNe42FktHDIIMpWiyhkUmKORDa wBICh0eEw4R54uA6O89VJ/WlzCyS0U//2n2JXvatglS/cEcJUMalgst7z5SY07S/R4vQ vTiwxPH7SDtomwAY3XeaL4nW99BjzT2xyfJxPv60seyLUZ0Sjrs7ESZlgM0jzdwI1vpw 4Z7CN6ZR6K3pOrhhYXflru/TRs+BVjZRqf9apAy0dauIz38u/iI0cYgf3q0v8tZJzX/H hJyA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o3-v6si19472538plk.321.2018.07.11.06.58.11; Wed, 11 Jul 2018 06:58:11 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388610AbeGKOCh (ORCPT + 23 others); Wed, 11 Jul 2018 10:02:37 -0400 Received: from foss.arm.com ([217.140.101.70]:36468 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388274AbeGKOCg (ORCPT ); Wed, 11 Jul 2018 10:02:36 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 2BB342381; Wed, 11 Jul 2018 06:58:08 -0700 (PDT) Received: from lakrids.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.72.51.249]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 1AC173F5B1; Wed, 11 Jul 2018 06:58:05 -0700 (PDT) From: Mark Rutland To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, will.deacon@arm.com Cc: catalin.marinas@arm.com, dave.martin@arm.com, hch@infradead.org, james.morse@arm.com, linux@dominikbrodowski.net, linux-fsdevel@vger.kernel.org, marc.zyngier@arm.com, mark.rutland@arm.com, viro@zeniv.linux.org.uk Subject: [PATCHv5 18/21] arm64: use {COMPAT,}SYSCALL_DEFINE0 for sigreturn Date: Wed, 11 Jul 2018 14:56:53 +0100 Message-Id: <20180711135656.20670-19-mark.rutland@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180711135656.20670-1-mark.rutland@arm.com> References: <20180711135656.20670-1-mark.rutland@arm.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Reviewed-by: Dominik Brodowski Acked-by: Catalin Marinas Cc: Will Deacon --- arch/arm64/kernel/signal.c | 2 +- arch/arm64/kernel/signal32.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) -- 2.11.0 diff --git a/arch/arm64/kernel/signal.c b/arch/arm64/kernel/signal.c index f03e664f773f..f8b0ba50e55e 100644 --- a/arch/arm64/kernel/signal.c +++ b/arch/arm64/kernel/signal.c @@ -539,7 +539,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;