From mboxrd@z Thu Jan 1 00:00:00 1970 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=-13.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 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 48E3DC47083 for ; Wed, 2 Jun 2021 11:25:39 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 913CA613D2 for ; Wed, 2 Jun 2021 11:25:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 913CA613D2 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 0FFE96B006C; Wed, 2 Jun 2021 07:25:38 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0B0976B006E; Wed, 2 Jun 2021 07:25:38 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E92806B0070; Wed, 2 Jun 2021 07:25:37 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0192.hostedemail.com [216.40.44.192]) by kanga.kvack.org (Postfix) with ESMTP id B9D266B006C for ; Wed, 2 Jun 2021 07:25:37 -0400 (EDT) Received: from smtpin36.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 14E8E37F1 for ; Wed, 2 Jun 2021 11:25:37 +0000 (UTC) X-FDA: 78208553514.36.18F58DE Received: from mail-ua1-f54.google.com (mail-ua1-f54.google.com [209.85.222.54]) by imf12.hostedemail.com (Postfix) with ESMTP id 0DB04547 for ; Wed, 2 Jun 2021 11:25:18 +0000 (UTC) Received: by mail-ua1-f54.google.com with SMTP id d13so391168uav.5 for ; Wed, 02 Jun 2021 04:25:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=AV6hHV9w+Q9HOaDxt1MduQbvvUP04JEJ1UZD5l/XTkY=; b=cXnY86xCfFjK1z2I/pklMZ30eVz3tKQ4FesdnxuhsEH3UrJpZWOecDzc4G+MzgqbnC xAlgWuNXrXG2My1Cbuf47m1UDRRs/rG+y2HBkxb48hUQc/KMU3ZhbHoedhT2Fcp/zT+y +l8G9O8uFLtdgD+HtyEQaawcald7c0hMEAc7QUTac4nCI8lY3Yw2hqfkQMzo13sDGQlD 3wXlaCzwC92RxtanakaV6FluhagfP8JW8UFJaoQjLRLhWP7T/xS0Yxn929KNNW8zGbK3 aZq84lqYYORG8p8VtaXpeoLhZr2jpkupFh1XYfXYuP49KIspXv9zsIr71HiggLCiSJxJ brYQ== X-Gm-Message-State: AOAM5303cvx2Bix4xXRzkoIr9o7EXUxQwgvashPdCemKBF8DaQ4IaTjs 7/fZqbLvRpHxdH56GvBWX7jKP59ubv1V1PxcgI8= X-Google-Smtp-Source: ABdhPJyzzWa9paQxXHYFBMFScAZBlkmtyILKANDBBOx9rPPA/yxyu03vLu3qpQ9izu7tVqpx2AMkJo4APWbgLQB/p8I= X-Received: by 2002:ab0:26d8:: with SMTP id b24mr14134972uap.58.1622633136111; Wed, 02 Jun 2021 04:25:36 -0700 (PDT) MIME-Version: 1.0 References: <20210602105348.13387-1-rppt@kernel.org> <20210602105348.13387-5-rppt@kernel.org> In-Reply-To: <20210602105348.13387-5-rppt@kernel.org> From: Geert Uytterhoeven Date: Wed, 2 Jun 2021 13:25:24 +0200 Message-ID: Subject: Re: [PATCH 4/9] m68k: remove support for DISCONTIGMEM To: Mike Rapoport Cc: Andrew Morton , Arnd Bergmann , Ivan Kokshaysky , Jonathan Corbet , Matt Turner , Mike Rapoport , Richard Henderson , Vineet Gupta , kexec@lists.infradead.org, alpha , Linux-Arch , Linux ARM , "open list:DOCUMENTATION" , "linux-ia64@vger.kernel.org" , Linux Kernel Mailing List , linux-m68k , "open list:BROADCOM NVRAM DRIVER" , Linux MM , linux-riscv , linux-s390 , Linux-sh list , arcml , "open list:TENSILICA XTENSA PORT (xtensa)" , linuxppc-dev , sparclinux Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 0DB04547 Authentication-Results: imf12.hostedemail.com; dkim=none; spf=pass (imf12.hostedemail.com: domain of geertuytterhoeven@gmail.com designates 209.85.222.54 as permitted sender) smtp.mailfrom=geertuytterhoeven@gmail.com; dmarc=none X-Rspamd-Server: rspam03 X-Stat-Signature: e616rji5cjbyrgmjj57nf144jeii9zng X-HE-Tag: 1622633118-589046 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: Hi Mike, On Wed, Jun 2, 2021 at 12:54 PM Mike Rapoport wrote: > From: Mike Rapoport > > DISCONTIGMEM was replaced by FLATMEM with freeing of the unused memory map > in v5.11. > > Remove the support for DISCONTIGMEM entirely. > > Signed-off-by: Mike Rapoport Thanks for your patch! Reviewed-by: Geert Uytterhoeven Acked-by: Geert Uytterhoeven > --- a/arch/m68k/include/asm/page_mm.h > +++ b/arch/m68k/include/asm/page_mm.h > @@ -126,25 +126,7 @@ static inline void *__va(unsigned long x) > > extern int m68k_virt_to_node_shift; > > -#ifndef CONFIG_DISCONTIGMEM > #define __virt_to_node(addr) (&pg_data_map[0]) With pg_data_map[] removed, this definition can go as well. Seems to be a leftover from 1008a11590b966b4 ("m68k: switch to MEMBLOCK + NO_BOOTMEM") There are a few more: arch/m68k/include/asm/mmzone.h:extern pg_data_t pg_data_map[]; arch/m68k/include/asm/mmzone.h:#define NODE_DATA(nid) (&pg_data_map[nid]) > -#else > -extern struct pglist_data *pg_data_table[]; > - > -static inline __attribute_const__ int __virt_to_node_shift(void) > -{ > - int shift; > - > - asm ( > - "1: moveq #0,%0\n" > - m68k_fixup(%c1, 1b) > - : "=d" (shift) > - : "i" (m68k_fixup_vnode_shift)); > - return shift; > -} > - > -#define __virt_to_node(addr) (pg_data_table[(unsigned long)(addr) >> __virt_to_node_shift()]) > -#endif > --- a/arch/m68k/mm/init.c > +++ b/arch/m68k/mm/init.c > @@ -44,28 +44,8 @@ EXPORT_SYMBOL(empty_zero_page); > > int m68k_virt_to_node_shift; > > -#ifdef CONFIG_DISCONTIGMEM > -pg_data_t pg_data_map[MAX_NUMNODES]; > -EXPORT_SYMBOL(pg_data_map); > - > -pg_data_t *pg_data_table[65]; > -EXPORT_SYMBOL(pg_data_table); > -#endif > - Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds