Commit d2bd44c4 authored by Angelo Dureghello's avatar Angelo Dureghello Committed by Greg Ungerer
Browse files

m68k: fix flatmem memory model setup 



Detected a broken boot on mcf54415, likely introduced from

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

Fix ARCH_PFN_OFFSET to be a pfn.

Signed-off-by: default avatarAngelo Dureghello <angelo@kernel-space.org>
Acked-by: default avatarMike Rapoport <rppt@linux.ibm.com>
Signed-off-by: default avatarGreg Ungerer <gerg@linux-m68k.org>
parent d434405a

arch/m68k/include/asm/page_mm.h

+1 −1
Original line number Diff line number Diff line
@@ -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 (m68k_memory[0].addr >> PAGE_SHIFT)

#include <asm-generic/memory_model.h>

#endif