From patchwork Tue Aug 6 11:24:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 170658 Delivered-To: patch@linaro.org Received: by 2002:a92:512:0:0:0:0:0 with SMTP id q18csp5567241ile; Tue, 6 Aug 2019 04:25:44 -0700 (PDT) X-Google-Smtp-Source: APXvYqxGs6WDDmwlaXz41au9M+UBvwpuEk5BGMilq+u92Yx8Ij4dLtUSRNoozsp0wVCzpSXHn9am X-Received: by 2002:a62:107:: with SMTP id 7mr3239484pfb.4.1565090744469; Tue, 06 Aug 2019 04:25:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565090744; cv=none; d=google.com; s=arc-20160816; b=Uwf4L+Ev2bvwwsPOd6Z9hqThqGKJr8J0EgbIxhD/hVa1+MhnFfooPGoJ5U+O7Detww tHhW9igt5wH0DW8rw+unZ4dST0Q7ynWNgbTTTySaw2UY3HowOHSbchVQLj5Wl82JlIwS HWsEr+8I15mgMnGq8EYPaaSAj73eQYpXCHegOZoNQ8fSriPRFrMlgOfH78dbvK3oYW7y 8/c+ZDujwhcL2FcrNNyAjMJ2ch7jcPeS1I8+bRLMzsthKz0Uk8adPDLO1FrdvuLcnXOs SIvRjoBOOHmxIE5//Nakgr9nc4T3OK4IlHXTzAJKTyNctZWqVRzBntEo27snsZtFx2x/ lt/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=2SraY1y2bpayPG711tXr/3+J7JdhoDzIdM0wxWWlRZE=; b=h9rbOXmPSX1JgbS9pgBIBf5xjRGrVrvOL42AUgiPz0MM/r2UClo/CF3si+cmXA7Rxq tC7Lh0JRRW250rJ1mFevlnGL/cdFE0haCYYMkgX5QXhtFCylxW1clkGD0EJo9heZzM87 iy6KaQvK0ILPPAjMnYuQBz9Fd8hk5TOoTG7jY4oTriCPMZbqTmvidDT+Yo90VSwjCXQJ cdKG2s3TUv4gr3P8YyXtLpZSyaAyL3PU/+nLnOh6fvsEdWs9MiqXTlzE3gtD7P0IiWPw t0w4v2ZDRrIpZd46/Ggt4E20y5iaT2FV9WUEES3wfukIS7koz6AYxWHaj9JSY7RmAmj/ pJJA== 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 h32si44217505pld.402.2019.08.06.04.25.44; Tue, 06 Aug 2019 04:25:44 -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 S1730799AbfHFLZn (ORCPT + 29 others); Tue, 6 Aug 2019 07:25:43 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:43241 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726783AbfHFLZm (ORCPT ); Tue, 6 Aug 2019 07:25:42 -0400 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.129]) with ESMTPA (Nemesis) id 1M8k65-1hz6Jj49jd-004lXd; Tue, 06 Aug 2019 13:25:11 +0200 From: Arnd Bergmann To: Andrew Morton Cc: Arnd Bergmann , Guenter Roeck , Andrey Konovalov , Andrey Ryabinin , Dmitry Vyukov , Will Deacon , Christoph Lameter , Mark Rutland , Ralf Baechle , Paul Burton , Vincenzo Frascino , James Hogan , linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] mips: fix vdso32 build, again Date: Tue, 6 Aug 2019 13:24:50 +0200 Message-Id: <20190806112509.3244608-1-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:tO/9/ogRr4bq49wvtFsjMqiEM/g67IcuFQnQPhgC0dvaFZES6do OlodkhyJzcaUlj8yPvV6FTl8C2G92YAL1i1PlwpwX2J6QwOiVKeGnGjHTCxRbFu30QNIbAT 2YNZAMFaWPnxbKEM/6tW1ObaR95gkjbi70KKIAda6F3xe/4ER1qdiETHtg0gEZOd4TlmNRC rgTB5ChE+OglZto5/nuWQ== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:NZiPuG2SpzM=:kx7Kz5EW9wktHhBlvjg5oO KbOlkmhGRCPmWY46mGnIpEqazZADvwPUwH+atGnrT95d5PIJFXHVLXreejD6+dFc5nm2Ru7qu u8fKKpKzGQrv479Sj6JABiogwuOgKIUzHQd+hlFv2+rJNEo1xdxWsHrS0zjt1e1r/eHPto4fc pxIyn+/7qUssiJa9emL7400pkywPlh46nASgze+QxHaW3yU63BAV+kjiWJ1adK4Jg/Z4gQ5UU r7Lw4HfJ23bRWmkHrD6FV+ffGhHYRf5RWlV98oWUjNvKr4HcOa/RKUkrvDiOrNKIJs8vdq6f4 7uDskf7o5tT62etkkklDSfeHgPkbZ1UJYhHyUe4E7kJNYRR9HCMmOTLTOMBiLALxE5Yy9mp6W 415dCzRwRjMf1poCdb/lx481E7jKEEqoVERXfkuUsriu2y5z5nCnRqifKp0z80pMqgCkLfwcl XXs5pRCVZicyUopNgfkw7X6MY8EpeYIThU8TTWtnjJfSHpTehxn7rvE9BHkWl28REU5KKxD7P F5LxdVG/e2D7D/YiP5YaPfbGce0oE95GJcjO7NGrM/o1PigZVUtZ7LhcT1F0UmGtb8EQBKUS1 c26hgRYddkHRhyfajRqe4nvzc0f26/Pkt6ntJcWziKwU9SUFDXY19flWwa9v6Bn39IO2NbJ/m F3Vph5R8IpIk5sLRnSRrudGWiD6GditAx4aHqD3NZKGbTkDx+6xzMDkHXJaeKHjaYbXgonMDA r8TAdcOTIxUcXqVOjQyKmbIkaX8g8r99UVnYTg== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The generic vdso support adds the same #if hack in two places, asm/vdso/vdso.h and config-n32-o32-env.c, but only the second is actually used. The result lacks the BUILD_VDSO32_64 macro, and that triggers a build error: ./include/linux/page-flags-layout.h:95:2: error: #error "Not enough bits in page flags" Move the macro into the other place, and remove the duplicated bits. Reported-by: Guenter Roeck Fixes: ee38d94a0ad8 ("page flags: prioritize kasan bits over last-cpuid") Fixes: 24640f233b46 ("mips: Add support for generic vDSO") Signed-off-by: Arnd Bergmann --- Please fold into the vdso patch --- arch/mips/include/asm/vdso/vdso.h | 11 ----------- arch/mips/vdso/config-n32-o32-env.c | 1 + 2 files changed, 1 insertion(+), 11 deletions(-) -- 2.20.0 diff --git a/arch/mips/include/asm/vdso/vdso.h b/arch/mips/include/asm/vdso/vdso.h index 3b96db735f7f..737ddfc3411c 100644 --- a/arch/mips/include/asm/vdso/vdso.h +++ b/arch/mips/include/asm/vdso/vdso.h @@ -6,17 +6,6 @@ #include -#if _MIPS_SIM != _MIPS_SIM_ABI64 && defined(CONFIG_64BIT) - -/* Building 32-bit VDSO for the 64-bit kernel. Fake a 32-bit Kconfig. */ -#define BUILD_VDSO32_64 -#undef CONFIG_64BIT -#define CONFIG_32BIT 1 -#ifndef __ASSEMBLY__ -#include -#endif -#endif - #ifndef __ASSEMBLY__ #include diff --git a/arch/mips/vdso/config-n32-o32-env.c b/arch/mips/vdso/config-n32-o32-env.c index da4994b2b3e5..7f8d957abd4a 100644 --- a/arch/mips/vdso/config-n32-o32-env.c +++ b/arch/mips/vdso/config-n32-o32-env.c @@ -12,6 +12,7 @@ #define CONFIG_32BIT 1 #define CONFIG_GENERIC_ATOMIC64 1 +#define BUILD_VDSO32_64 #endif