diff options
| author | Angelo Dureghello <angelo@kernel-space.org> | 2021-02-28 20:08:28 +0100 |
|---|---|---|
| committer | Greg Ungerer <gerg@linux-m68k.org> | 2021-04-12 09:34:26 +1000 |
| commit | d2bd44c4c05d043fb65cfdf26c54e6d8b94a4b41 (patch) | |
| tree | 75e7b671226a5f533ff139a0b2f5378e43f1ef07 /arch | |
| parent | d434405aaab7d0ebc516b68a8fc4100922d7f5ef (diff) | |
| download | linux-d2bd44c4c05d043fb65cfdf26c54e6d8b94a4b41.tar.bz2 | |
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>
Diffstat (limited to 'arch')
| -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 9e8f0cc30a2c..2411ea9ef578 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 |