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=-16.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable 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 47169C47099 for ; Wed, 2 Jun 2021 14:03:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 29EA3613BA for ; Wed, 2 Jun 2021 14:03:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230157AbhFBOFC (ORCPT ); Wed, 2 Jun 2021 10:05:02 -0400 Received: from mail.kernel.org ([198.145.29.99]:46842 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229654AbhFBOE6 (ORCPT ); Wed, 2 Jun 2021 10:04:58 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 8CE12613B8; Wed, 2 Jun 2021 14:03:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1622642595; bh=rVTIekozkKZiHFO8KV73KQ3u8bmmogfis0wnY/V9zMk=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=j8vmJNJ02mTS2qujW9AuK34CyGewsKEQa3NJI4x54mI/kZ6TFkXgNShYSldLi9wwR iVZIZpo10XmlpdD1gKCLSxI2hAconHrCrMCgpriX/VTH8VoFXTo8owedKrPE/jIZ0c D0z4cOoqJMINruzqON7gaCTnozO9ZlPYtavKjKyFVVT2dZ+EtfNVi3gYHbuLNepcSX +gq/yzfSnUELMMLNTwhQ6DbA0qs/Rfv2LkuAbudO4aFFo53imu8k7hO2V3DMiMK48/ BPzuDC2hRRaPw3diNLbn7YRlcBUV1pB+YMb1s77Dpt31JAkWDkRc6hv1mITOzdI2oz pUQhhp2WADSpA== Date: Wed, 2 Jun 2021 17:03:01 +0300 From: Mike Rapoport To: Geert Uytterhoeven 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 Subject: Re: [PATCH 4/9] m68k: remove support for DISCONTIGMEM Message-ID: References: <20210602105348.13387-1-rppt@kernel.org> <20210602105348.13387-5-rppt@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Jun 02, 2021 at 01:25:24PM +0200, Geert Uytterhoeven wrote: > 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]) It seems that arch/m68k/include/asm/mmzone.h can be simply removed. > > -#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 -- Sincerely yours, Mike.