From patchwork Thu Feb 14 13:35:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mark Rutland X-Patchwork-Id: 220444 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 430432C0089 for ; Fri, 15 Feb 2013 00:39:42 +1100 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1U5yyu-00041t-ON; Thu, 14 Feb 2013 13:36:08 +0000 Received: from cam-admin0.cambridge.arm.com ([217.140.96.50]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1U5yym-00041a-KH for linux-arm-kernel@lists.infradead.org; Thu, 14 Feb 2013 13:36:06 +0000 Received: from e106331-lin.cambridge.arm.com (e106331-lin.cambridge.arm.com [10.1.77.32]) by cam-admin0.cambridge.arm.com (8.12.6/8.12.6) with ESMTP id r1EDZqki005484; Thu, 14 Feb 2013 13:35:52 GMT Date: Thu, 14 Feb 2013 13:35:52 +0000 From: Mark Rutland To: "viro@zeniv.linux.org.uk" Subject: [PATCH] arm64: fix invocation of restore_altstack Message-ID: <20130214133552.GB25537@e106331-lin.cambridge.arm.com> MIME-Version: 1.0 Content-Disposition: inline user-agent: Mutt/1.5.20 (2009-06-14) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130214_083600_904930_DB30DE3F X-CRM114-Status: GOOD ( 15.92 ) X-Spam-Score: -7.6 (-------) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-7.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high trust [217.140.96.50 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.7 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Catalin Marinas , "linux-kernel@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org Hello, I noticed the following issue while attempting to build an arm64 kernel from next-20130214, and it still seems to be present in signal/for-next and signal/arch-arm64. It looks to be a trivial typo. Thanks, Mark. ---->8--- Since e6d056c7c0: "arm64: switch to generic sigaltstack", arm64 won't build: arch/arm64/kernel/signal.c: In function ‘sys_rt_sigreturn’: arch/arm64/kernel/signal.c:152:2: error: incompatible type for argument 1 of ‘restore_altstack’ In file included from arch/arm64/kernel/signal.c:21:0: include/linux/signal.h:434:5: note: expected ‘const struct stack_t *’ but argument is of type ‘stack_t’ make[1]: *** [arch/arm64/kernel/signal.o] Error 1 make: *** [arch/arm64/kernel] Error 2 This patch fixes up the call to restore_altstack to pass the correct type. Signed-off-by: Mark Rutland --- arch/arm64/kernel/signal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/kernel/signal.c b/arch/arm64/kernel/signal.c index d60ad23..890a591 100644 --- a/arch/arm64/kernel/signal.c +++ b/arch/arm64/kernel/signal.c @@ -149,7 +149,7 @@ asmlinkage long sys_rt_sigreturn(struct pt_regs *regs) if (restore_sigframe(regs, frame)) goto badframe; - if (restore_altstack(frame->uc.uc_stack)) + if (restore_altstack(&frame->uc.uc_stack)) goto badframe; return regs->regs[0];