From patchwork Tue Jul 10 15:16:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 10517151 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id F179D6032A for ; Tue, 10 Jul 2018 15:17:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E030228F96 for ; Tue, 10 Jul 2018 15:17:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D372428FF3; Tue, 10 Jul 2018 15:17:09 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6BF0028F96 for ; Tue, 10 Jul 2018 15:17:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=0g0JRnz+vzwxXEPUD/kLr8A0aaQiGPz4zh/EXGN6Kww=; b=GW0 aGbxv7Fi0Q3rEr5HuvOLbBk0E6Wzj4Y7yBqqtze+bLED6nRnj5ZONo3QgrQ4aSiINSg8FgeF9rxTz fxFd4SBxcpe1CedQGtlvDsRnOs4uHmqPL2/ZrjvbDe85bL9FOyYC6J8Okel3tPHFycIMm6n0sKNWc kTUR+uWzm0IbkucFBRC16klYkzD7FcJkWmCKL28ac1V0u9/+HsZmB2BDX8cXAedtuPMfLxlP2biPt 0tSQVxdgKnExSJiEijvsPDCjgIOD14iS89zBXJZ0dy/QOkMUqhLCk804JunXd2B2bbm3h3MOS5+TP XIzTq/xaRVwwSuDsrVlNUSkLeulVKtQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fcuNz-000094-30; Tue, 10 Jul 2018 15:17:03 +0000 Received: from mout.kundenserver.de ([212.227.126.130]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fcuNu-00006G-Tm for linux-arm-kernel@lists.infradead.org; Tue, 10 Jul 2018 15:17:00 +0000 Received: from wuerfel.lan ([46.223.138.35]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0LcKBC-1gKFYc10FC-00jtcC; Tue, 10 Jul 2018 17:16:40 +0200 From: Arnd Bergmann To: Catalin Marinas , Will Deacon Subject: [PATCH] arm64: make flatmem depend on !NUMA Date: Tue, 10 Jul 2018 17:16:27 +0200 Message-Id: <20180710151639.2184213-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K1:EbLMfbAruLMS4LOXW/AMlCy9LVL6iNsHIoOI1VuwuOi1SzbgZxR 3YYFyBiWm4MjBUXj6xc9lqluaL30QJ8JIPXl7Iv0R6YTTWss9k+joPLqS9zg9IIYSS0HN+W ceIh7BbuhabfZv27l/JEPKnpo8ON2wCjnpsOzUrqUsJXIq6yF3J5T6xTciP/kkG0ejUJ7x3 ZQebNdTvPyFviGgv2A2bg== X-UI-Out-Filterresults: notjunk:1; V01:K0:UsLc3jTikeI=:V/BaPXcvEV9PCIkWrGl+yo 1qUJqdO9eMjqK28KH/6Sp3d1I/5RrhHaoMdtP+c1c5JYTHvgSZ1IZrD+dMhNaWO87WIljr/Ro qQ56PiCtQ14wdn/DvG9eZsrT43hM8l7+w6KW/EtZlxftHO5fc6eU9sNQOLoH9tQLZftjObS50 m8ys1azgR5uf1a02NVc/FJiZGgaNTX81bv9tx5nVEE0nnSnZ4yVaWTJnMRnbpN9Nz2GbFrziU KkxZ5ZhOzxDGEPqEghK+G8THyhk0z8NIUYNdNuSrraDM6Zf8i4W52zaGlc9a3SuWdny8fXTOy 220lbuGFFAYgGKU3iOC1uoPCdNu5VYUjfTPd+HGcIOWLgEiZ1FkUVjFNiSCDtF5l0JLro+Lzr 81cDTkupiOtw++XET+Z6i0Xx6U00zwWBB1D0Eq489PL9OIxl4SyrsOsrafoDCoJy3doG9ys8c Qhy5g8jjFGSJyCvVQBmKs3RpE1oQ0w/3E6gFOQ+EUBT/3aYuDOBrbWy5JUcul/JUxG6Ya86Gs gDafUYo/twvHQBaXumzyLb52s7lgVj0abax8aVAKyE2FTtKOW0VZutVuuryTv+xjHUeuByHda dzDY8J2bKbotMsxADcDgDXwavr0kaoHv5iOiAoUjPUWAEIDG/XDFQVHTETSHbSsO6ACUXaEE/ +MYowiYfZRa2h+FeTgCvhGc3mQu7Mw+o/OfpCgpuvoAnwCRLEP1AuvuIt0y5J76dO5+8= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180710_081659_352890_D1846ECA X-CRM114-Status: GOOD ( 12.76 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Marc Zyngier , Nikunj Kela , linux-arm-kernel@lists.infradead.org, Arnd Bergmann , linux-kernel@vger.kernel.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Building without NUMA but with FLATMEM results in a link error because mem_map[] is not available: aarch64-linux-ld -EB -maarch64elfb --no-undefined -X -pie -shared -Bsymbolic --no-apply-dynamic-relocs --build-id -o .tmp_vmlinux1 -T ./arch/arm64/kernel/vmlinux.lds --whole-archive built-in.a --no-whole-archive --start-group arch/arm64/lib/lib.a lib/lib.a --end-group init/do_mounts.o: In function `mount_block_root': do_mounts.c:(.init.text+0x1e8): undefined reference to `mem_map' arch/arm64/kernel/vdso.o: In function `vdso_init': vdso.c:(.init.text+0xb4): undefined reference to `mem_map' This uses the same trick as the other architectures, making flatmem depend on !NUMA to avoid the broken configuration. Fixes: e7d4bac428ed ("arm64: add ARM64-specific support for flatmem") Signed-off-by: Arnd Bergmann --- arch/arm64/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 1dd68d973704..ba19f03bc327 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -787,7 +787,7 @@ config ARCH_SELECT_MEMORY_MODEL def_bool ARCH_SPARSEMEM_ENABLE config ARCH_FLATMEM_ENABLE - def_bool y + def_bool !NUMA config HAVE_ARCH_PFN_VALID def_bool ARCH_HAS_HOLES_MEMORYMODEL || !SPARSEMEM