Skip to content

Commit

Permalink
m68k: fix flatmem memory model setup
Browse files Browse the repository at this point in the history
Detected a broken boot on mcf54415, likely introduced from

commit 4bfc848
("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>
  • Loading branch information
Angelo Dureghello authored and Greg Ungerer committed Apr 11, 2021
1 parent d434405 commit d2bd44c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/m68k/include/asm/page_mm.h
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit d2bd44c

Please sign in to comment.