From patchwork Mon May 14 09:46:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Rutland X-Patchwork-Id: 135715 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp1532864lji; Mon, 14 May 2018 02:48:50 -0700 (PDT) X-Google-Smtp-Source: AB8JxZrx1+fC+auI1hBF++H279+gnM6pfhLb4cmYV9uC+kiE/C1fte2QMGR4s2IgHwW49oVOf4KV X-Received: by 2002:a65:4502:: with SMTP id n2-v6mr7685178pgq.95.1526291330620; Mon, 14 May 2018 02:48:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526291330; cv=none; d=google.com; s=arc-20160816; b=HLlxrru0KjOGvcS5PJzhyDspcAXtIFDU3iKsn4qw3uDLLLdeGP7JpXsCOSJyDCBidk S7XtNjPK2Q0q9nY4C8srY748l5RwnVsdzytjI5RwAZVeQcRML8J1XXvcadhdsuSj/l1M uGpWh76LxbvoSTlOA2tBqHqGIKC7zLVtHEh5jAAXkVzsqdpC5a2TampDQuB3SkRjIs9t 22cagQpfOo1gCpgG0bMlyU0jGWbkSI49FuMyyiNz8yX1fxDpR6TgfrGmIbIjf7cSxnEW 9Xi5yVNqt9Xxcs6xpf94h63imeZMWgGrtIRWJ1TW1huIBTM9Q8P0Ou/pu+VOVhKwdrdG Ncvw== 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=A6ko3l4Du7TuwpYardRYzIXMWZ9FzcdlSYgI0k5php5Ud3/2idEQvvm+QKOOiVkxKn r+7D4mpWvTLbgj3r2IyvuT3VIaF4sTGuFRNXsVpCuxwodANOTuQsm8/UT6y3j9Tgs133 mOBuCQqQVk9oAXpeFS06DdAP7oKSW4yCvCqxHRTE4ECe5EpnIyYlWlbdQb9xeS6Knmjy 3nHP/+ebi3WQT8J8wAI2gffsU9LCifltAKc9+cD8xwQAoC4bdvjK9sPhdXKm8ChwTlAt umAWtfWRbLxQjpCevHcwStUe6bGLYOMuF/ThMetkwTtWovrgBjgx0HCpVOq0YLmWTaLA Bvgw== 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 x33-v6si8809804plb.512.2018.05.14.02.48.50; Mon, 14 May 2018 02:48:50 -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 S1752695AbeENJsF (ORCPT + 29 others); Mon, 14 May 2018 05:48:05 -0400 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:38348 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752611AbeENJsB (ORCPT ); Mon, 14 May 2018 05:48:01 -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 19E1D19E8; Mon, 14 May 2018 02:48:01 -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 2CD423F25D; Mon, 14 May 2018 02:47:59 -0700 (PDT) From: Mark Rutland To: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org, catalin.marinas@arm.com, dave.martin@arm.com, 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, will.deacon@arm.com Subject: [PATCH 15/18] arm64: use {COMPAT,}SYSCALL_DEFINE0 for sigreturn Date: Mon, 14 May 2018 10:46:37 +0100 Message-Id: <20180514094640.27569-16-mark.rutland@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180514094640.27569-1-mark.rutland@arm.com> References: <20180514094640.27569-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;