Hi,
On Sun, Feb 28, 2021 at 12:20:58AM +0100, Angelo Dureghello wrote:
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@xxxxxxxxxxxxxxxx>
---
arch/m68k/include/asm/page_mm.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/m68k/include/asm/page_mm.h b/arch/m68k/include/asm/page_mm.h
index 8cfc92451711..84551b1a8b93 100644
--- a/arch/m68k/include/asm/page_mm.h
+++ b/arch/m68k/include/asm/page_mm.h
@@ -167,7 +167,7 @@ static inline __attribute_const__ int __virt_to_node_shift(void)
((__p) - pgdat->node_mem_map) + pgdat->node_start_pfn; \
})
#else
-#define ARCH_PFN_OFFSET (m68k_memory[0].addr)
+#define ARCH_PFN_OFFSET (PAGE_OFFSET >> PAGE_SHIFT)
Please keep m68k_memory[0].addr and only add the PAGE_SHIFT I've forgot in
4bfc848e0981.
Some of the configurations with motorola mmu would be broken with static
PAGE_OFFSET and they require the actual detected memory start to be used as
ARCH_PFN_OFFSET.
#include <asm-generic/memory_model.h>
#endif
--
2.30.1
--
Sincerely yours,
Mike.
