From patchwork Fri Jun 1 11:24:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Rutland X-Patchwork-Id: 137519 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp807276lji; Fri, 1 Jun 2018 04:27:25 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKC1FCsYbbuUOGwnhCFk7U9uNuCIARgjTbzQpV3WFw+WpmL99aOxuP+U0GvDHO/l44nga6P X-Received: by 2002:a62:1fd6:: with SMTP id l83-v6mr10674628pfj.182.1527852444969; Fri, 01 Jun 2018 04:27:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527852444; cv=none; d=google.com; s=arc-20160816; b=b3php2FcorFNsSg7tJNTDU0bkJi3yEsFqlXk7ulwHrxs1iPqK+QaRU6hfUsgySfXf8 4uJPCgLkbMfsToWSRdGqfTSIqjC5JclnGiGUmQbdiD9SURjqgooNJPci3UcNLZRm87Wy Q9s2/nC4X657HgmkFg+gE9U41DhJY+kC0bs8xK4w45P2E2hcE4D/rYZ0IPprOYyrOO4u toppQa4OmjGw6vdPtZkyGMe73brOSaRWjS62mfT3N0B9IasfgHnpDbvzKzv4lrCKgVTz Zg4SbtuLHrN9s5j0y6CMZOsxOaQiDG+VzqN0bq5WQW+5qOzqbPjHj54/QdDPbdak1RLz wE1Q== 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=hBjJuyDd1pK2W0iK9C6UkQAUr59FhFQAPEcgIlSDjfo=; b=uOJ7Ptb4cCb9ggQVaOEuISJjZIQvWSPkc/ZgQkVkUK3uzh7z1GDNkjD6i58ryJc4Lz 7CSJLXtPd3Cwwfc+dkfdGnzEOTIuhv+h2u61/YzPI0v9iQ7ON5c+BoUet+DMcCH8iUBf eXWONU98J1/Gp7P1CCEnoZETlX0w9Ut8mi9RbDZIRieddxmwmgkvwrohDV7qBEewo8SO UyeZd2zAcycVZVe6NoknlEyD+8CvWS5Jp8jKRpHcyPvB1Z+08bPOPVzDd9u5jnBIfAHv ePAwNO5Jw1mUqvmmpDokMjF6rfS50BOEBfg+LUWfTC6953Z2U2P0lkReM0h/5NjRGw/v Zijg== 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 h4-v6si678978pgs.201.2018.06.01.04.27.24; Fri, 01 Jun 2018 04:27:24 -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 S1752141AbeFAL1W (ORCPT + 30 others); Fri, 1 Jun 2018 07:27:22 -0400 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:50368 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751775AbeFALZU (ORCPT ); Fri, 1 Jun 2018 07:25:20 -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 DC3A516EA; Fri, 1 Jun 2018 04:25:19 -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 CEC793F25D; Fri, 1 Jun 2018 04:25:18 -0700 (PDT) From: Mark Rutland To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, will.deacon@arm.com, catalin.marinas@arm.com Cc: Mark Rutland Subject: [PATCHv2 16/19] arm64: use {COMPAT,}SYSCALL_DEFINE0 for sigreturn Date: Fri, 1 Jun 2018 12:24:38 +0100 Message-Id: <20180601112441.37810-17-mark.rutland@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180601112441.37810-1-mark.rutland@arm.com> References: <20180601112441.37810-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 Cc: 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 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;