diff options
| author | Angelo Dureghello <angelo@kernel-space.org> | 2021-02-28 20:08:28 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-04-28 13:41:50 +0200 |
| commit | 8b9c42fdd6ee40a316672e2052d729bac4ae2583 (patch) | |
| tree | fe0663ed50eafab2fd1dc0dbdff57298e80741ce | |
| parent | 1baa29c660b8b75c1cd06e743d9faca7ee323b1f (diff) | |
| download | linux-8b9c42fdd6ee40a316672e2052d729bac4ae2583.tar.gz linux-8b9c42fdd6ee40a316672e2052d729bac4ae2583.tar.bz2 linux-8b9c42fdd6ee40a316672e2052d729bac4ae2583.zip | |
m68k: fix flatmem memory model setup
[ Upstream commit d2bd44c4c05d043fb65cfdf26c54e6d8b94a4b41 ]
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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | arch/m68k/include/asm/page_mm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/include/asm/page_mm.h b/arch/m68k/include/asm/page_mm.h index 7f5912af2a52..21b1071e0a34 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 (m68k_memory[0].addr >> PAGE_SHIFT) #include <asm-generic/memory_model.h> #endif |