From patchwork Fri Mar 12 14:12:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 12134741 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 723A6C433E0 for ; Fri, 12 Mar 2021 14:12:21 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id E4D2D64FA9 for ; Fri, 12 Mar 2021 14:12:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E4D2D64FA9 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linux-m68k.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 7451B8D0358; Fri, 12 Mar 2021 09:12:20 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 6CD318D0346; Fri, 12 Mar 2021 09:12:20 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 56DBE8D0358; Fri, 12 Mar 2021 09:12:20 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0187.hostedemail.com [216.40.44.187]) by kanga.kvack.org (Postfix) with ESMTP id 3490D8D0346 for ; Fri, 12 Mar 2021 09:12:20 -0500 (EST) Received: from smtpin15.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id E66E6181DF75C for ; Fri, 12 Mar 2021 14:12:19 +0000 (UTC) X-FDA: 77911411998.15.1F6C905 Received: from andre.telenet-ops.be (andre.telenet-ops.be [195.130.132.53]) by imf17.hostedemail.com (Postfix) with ESMTP id 0269C4080F66 for ; Fri, 12 Mar 2021 14:12:16 +0000 (UTC) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed20:f9e2:c536:b8cc:fbbc]) by andre.telenet-ops.be with bizsmtp id fSCA2400i1ACAb301SCAWP; Fri, 12 Mar 2021 15:12:11 +0100 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1lKiWQ-0078a8-Fi; Fri, 12 Mar 2021 15:12:10 +0100 Received: from geert by rox.of.borg with local (Exim 4.93) (envelope-from ) id 1lKiWP-00EXYF-Qd; Fri, 12 Mar 2021 15:12:09 +0100 From: Geert Uytterhoeven To: Mike Rapoport , Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH] mm: Remove default DISCONTIGMEM_MANUAL Date: Fri, 12 Mar 2021 15:12:08 +0100 Message-Id: <20210312141208.3465520-1-geert@linux-m68k.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Stat-Signature: neocia9chzo6zehu7quj5ffixei73jtc X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 0269C4080F66 Received-SPF: none (linux-m68k.org>: No applicable sender policy available) receiver=imf17; identity=mailfrom; envelope-from=""; helo=andre.telenet-ops.be; client-ip=195.130.132.53 X-HE-DKIM-Result: none/none X-HE-Tag: 1615558336-505850 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Commit 214496cb18700fd7 ("ia64: make SPARSEMEM default and disable DISCONTIGMEM") removed the last enabler of ARCH_DISCONTIGMEM_DEFAULT, hence the memory model can no longer default to DISCONTIGMEM_MANUAL. Signed-off-by: Geert Uytterhoeven Reviewed-by: Mike Rapoport Reviewed-by: David Hildenbrand --- DISCONTIGMEM_MANUAL depends on ARCH_DISCONTIGMEM_ENABLE, which in turns depends on BROKEN, so probably all discontig memory support can be removed, too? --- mm/Kconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/mm/Kconfig b/mm/Kconfig index 24c045b24b95069b..579254f10fb1bac6 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -9,7 +9,6 @@ config SELECT_MEMORY_MODEL choice prompt "Memory model" depends on SELECT_MEMORY_MODEL - default DISCONTIGMEM_MANUAL if ARCH_DISCONTIGMEM_DEFAULT default SPARSEMEM_MANUAL if ARCH_SPARSEMEM_DEFAULT default FLATMEM_MANUAL help