From patchwork Thu Jan 18 22:26:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 863194 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zMz9r2Zk7z9t62 for ; Fri, 19 Jan 2018 09:28:00 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="Ur8lFoUW"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3zMz9r0nR3zF0mX for ; Fri, 19 Jan 2018 09:28:00 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="Ur8lFoUW"; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from ozlabs.org (bilbo.ozlabs.org [103.22.144.67]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3zMz7d31v2zF0hR for ; Fri, 19 Jan 2018 09:26:05 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="Ur8lFoUW"; dkim-atps=neutral Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPSA id 3zMz7c5cTHz9t62; Fri, 19 Jan 2018 09:26:04 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1516314364; bh=oOq86SIYvNqrV2Tmp81jT5Q4BANH/wmrpqowlgtcmBA=; h=Date:From:To:Cc:Subject:From; b=Ur8lFoUW1FG0pAL2wgfV6zXu6zqfL8QkqAzW2GwqMoiwb4UMEH6S4gl0rRN4UQsvE L+7QX1yzmKxeBy0roTWyHRokZzmjkh8LOw7G24ylHPomLxD2nPWXHnNPb2aX0G9Krl SipvR5u5I0OVepBjlPbsLVzWBwjwGUuO9fwDR8q0evHqJcT5zPC6sx5xStT+QzqgRo PoH/47JYseU3L/An55GSsS7Y7I1CYAIATSQ/uv77F1BSH1TQLTjYd6CAZHxeYGz4uu uY4dmlvOIKsi3TfFawfbYUgJr6vrIHVOh0dWfGtp1aepFYR7GlhITT0X4agWxZKB5t ZSrn1Sn7g+rtQ== Date: Fri, 19 Jan 2018 09:26:03 +1100 From: Stephen Rothwell To: Michael Ellerman , Benjamin Herrenschmidt , PowerPC Subject: linux-next: build failure after merge of the powerpc tree Message-ID: <20180119092603.5adb8912@canb.auug.org.au> MIME-Version: 1.0 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.24 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Nicholas Piggin Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Hi all, After merging the powerpc tree, today's linux-next build (powerpc ppc64_defconfig) failed like this: In file included from include/asm-generic/bug.h:18:0, from arch/powerpc/include/asm/bug.h:128, from include/linux/bug.h:5, from arch/powerpc/include/asm/mmu.h:126, from arch/powerpc/include/asm/lppaca.h:36, from arch/powerpc/include/asm/paca.h:21, from arch/powerpc/include/asm/current.h:16, from include/linux/sched.h:12, from arch/powerpc/kernel/setup_64.c:15: arch/powerpc/kernel/setup_64.c: In function 'init_fallback_flush': arch/powerpc/kernel/setup_64.c:864:14: error: implicit declaration of function 'safe_stack_limit'; did you mean 'save_stack_trace'? [-Werror=implicit-function-declaration] limit = min(safe_stack_limit(), ppc64_rma_size); ^ include/linux/kernel.h:790:2: note: in definition of macro '__min' t1 min1 = (x); \ ^~ arch/powerpc/kernel/setup_64.c:864:10: note: in expansion of macro 'min' limit = min(safe_stack_limit(), ppc64_rma_size); ^~~ include/linux/kernel.h:792:16: error: comparison of distinct pointer types lacks a cast [-Werror] (void) (&min1 == &min2); \ ^ include/linux/kernel.h:801:2: note: in expansion of macro '__min' __min(typeof(x), typeof(y), \ ^~~~~ arch/powerpc/kernel/setup_64.c:864:10: note: in expansion of macro 'min' limit = min(safe_stack_limit(), ppc64_rma_size); ^~~ Caused by commit 1af19331a3a1 ("powerpc/64s: Relax PACA address limitations") interacting with commit aa8a5e0062ac ("powerpc/64s: Add support for RFI flush of L1-D cache") from Linus' tree. I applied the following fix patch. From: Stephen Rothwell Date: Fri, 19 Jan 2018 09:21:44 +1100 Subject: [PATCH] powerpc: fix up for safe_stack_limit rename Signed-off-by: Stephen Rothwell --- arch/powerpc/kernel/setup_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c index 9e23c74896cc..f2b532f00861 100644 --- a/arch/powerpc/kernel/setup_64.c +++ b/arch/powerpc/kernel/setup_64.c @@ -861,7 +861,7 @@ static void init_fallback_flush(void) int cpu; l1d_size = ppc64_caches.l1d.size; - limit = min(safe_stack_limit(), ppc64_rma_size); + limit = min(ppc64_bolted_size(), ppc64_rma_size); /* * Align to L1d size, and size it at 2x L1d size, to catch possible