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 [off-list ref] wrote:

quoted

From: Mike Rapoport <redacted>

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 <redacted>

Thanks for your patch!

Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>

quoted

--- 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.
 

quoted

-#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

quoted

--- 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.