commit d2bd44c4c05d043fb65cfdf26c54e6d8b94a4b41
author Angelo Dureghello <angelo@kernel-space.org> Sun Feb 28 20:08:28 2021 +0100
committer Greg Ungerer <gerg@linux-m68k.org> Mon Apr 12 09:34:26 2021 +1000
tree 75e7b671226a5f533ff139a0b2f5378e43f1ef07
parent d434405aaab7d0ebc516b68a8fc4100922d7f5ef

m68k: fix flatmem memory model setup

Detected a broken boot on mcf54415, likely introduced from

commit 4bfc848e0981
("m68k/mm: enable use of generic memory_model.h for !DISCONTIGMEM")

Fix ARCH_PFN_OFFSET to be a pfn.

Signed-off-by: Angelo Dureghello <angelo@kernel-space.org>
Acked-by: Mike Rapoport <rppt@linux.ibm.com>
Signed-off-by: Greg Ungerer <gerg@linux-m68k.org>

arch/m68k/include/asm/page_mm.h

diff --git a/arch/m68k/include/asm/page_mm.h b/arch/m68k/include/asm/page_mm.h
index 9e8f0cc..2411ea9 100644
--- a/arch/m68k/include/asm/page_mm.h
+++ b/arch/m68k/include/asm/page_mm.h
@@ -167,7 +167,7 @@
 	((__p) - pgdat->node_mem_map) + pgdat->node_start_pfn;		\
 })
 #else
-#define ARCH_PFN_OFFSET (m68k_memory[0].addr)
+#define ARCH_PFN_OFFSET (m68k_memory[0].addr >> PAGE_SHIFT)
 #include <asm-generic/memory_model.h>
 #endif