Skip to content

Commit

Permalink
m68k: fix early memory reservation for ColdFire MMU systems
Browse files Browse the repository at this point in the history
The bootmem to memblock conversion introduced by the commit 1008a11
("m68k: switch to MEMBLOCK + NO_BOOTMEM") made reservation of kernel code
and data to start from a wrong address.

Fix it.

Signed-off-by: Mike Rapoport <[email protected]>
Tested-by: Angelo Dureghello <[email protected]>
Signed-off-by: Greg Ungerer <[email protected]>
  • Loading branch information
rppt authored and Greg Ungerer committed Sep 3, 2018
1 parent 5736184 commit c90bbce
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/m68k/mm/mcfmmu.c
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ void __init cf_bootmem_alloc(void)
high_memory = (void *)_ramend;

/* Reserve kernel text/data/bss */
memblock_reserve(memstart, memstart - _rambase);
memblock_reserve(_rambase, memstart - _rambase);

m68k_virt_to_node_shift = fls(_ramend - 1) - 6;
module_fixup(NULL, __start_fixup, __stop_fixup);
Expand Down

0 comments on commit c90bbce

Please sign in to comment.