From patchwork Mon Jul 2 11:04:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Rutland X-Patchwork-Id: 140735 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp3856510ljj; Mon, 2 Jul 2018 04:06:44 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJjfHnzyBgTqKmD5rQ30N+7Xhz80lTd6GC5VH0sUNarj9tm6pwHaAihCFOf+8DCyj4QPdWI X-Received: by 2002:a17:902:758e:: with SMTP id j14-v6mr24838616pll.160.1530529603894; Mon, 02 Jul 2018 04:06:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530529603; cv=none; d=google.com; s=arc-20160816; b=PtId8Fe4kK0iYaZSEy3PecsoQSqhh/aDCC7Lv0ouZpjG8ks+AtfN1iplwoYsP/ZV2+ PVoSLevSA7nzT/L5ABdMTihafcv7f5Kf3lLzKzF2ozP4v4PHeJ7gD9EGlTKd9Go+5gDE d4MCLPgPoC2NWID4pH4uxNlTiPiM7bXGgPri2Gc0Y27t/xPowfSVIeBYZzR7soupeu2e oS7mKAmtVID9ZKUMRdndqNIFyRvoKcwUSPxpmtKXS+wNmMOpger53gFOdM0XRkUpZJod I1thtuDHhBTv7nio+TFunq9Hn1oGz/dwZAy7uGLQWlcqDk4Jj6ObYoubcUIwzzV0KBu0 gRZw== 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=TY3hjp9EKT0YUMwhLRq2aHVlBpztNiLR0mVGuuzQ1xM8GDQYlSv0HJO1CYvHMPHFO0 Cg2jAvN3sa5i0CM2TTbnRRdeR+E5nT8iZTgbC9N4jQTBTcbyw8vyZep5lCqiaWKzq55+ elat3gJUKQe8WK48VrCKuYEYp/5z9nme7UsuNOMzG/KBakBDqPGrF5fAE3yZD+JsxjS6 rfBVUBPbvOuwi+LZZKux405xxWJEqm7SaSgnT/kjtrJ+OT0X54w/1liNdkvgekXv85GZ GhWy1r/ARLTJQvsc2wl6yi+z1Bu89wZ7sNnZIsEViXukFz9Oj9gAa9JrH7cQj7vCrPM0 O5iQ== 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 n68-v6si14165152pga.662.2018.07.02.04.06.43; Mon, 02 Jul 2018 04:06:43 -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 S1030348AbeGBLGk (ORCPT + 31 others); Mon, 2 Jul 2018 07:06:40 -0400 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:57632 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1030458AbeGBLFI (ORCPT ); Mon, 2 Jul 2018 07:05:08 -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 463FC1688; Mon, 2 Jul 2018 04:05: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 35CC63F5BA; Mon, 2 Jul 2018 04:05:06 -0700 (PDT) From: Mark Rutland To: linux-arm-kernel@lists.infradead.org, will.deacon@arm.com Cc: linux-kernel@vger.kernel.org, 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: [PATCHv4 16/19] arm64: use {COMPAT,}SYSCALL_DEFINE0 for sigreturn Date: Mon, 2 Jul 2018 12:04:12 +0100 Message-Id: <20180702110415.10465-17-mark.rutland@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180702110415.10465-1-mark.rutland@arm.com> References: <20180702110415.10465-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;