Message ID | 20190924151956.9528-1-tbogendoerfer@suse.de (mailing list archive) |
---|---|
State | Mainlined |
Commit | 66b416ee41ed7a8216e5234a96288dbb8124e4b6 |
Headers | show |
Series | MIPS: init: Fix reservation of memory between PHYS_OFFSET and mem start | expand |
Hello, Thomas Bogendoerfer wrote: > Fix calculation of the size for reserving memory between PHYS_OFFSET > and real memory start. Applied to mips-fixes. > commit 66b416ee41ed > https://git.kernel.org/mips/c/66b416ee41ed > > Fixes: a94e4f24ec83 ("MIPS: init: Drop boot_mem_map") > Signed-off-by: Thomas Bogendoerfer <tbogendoerfer@suse.de> > Signed-off-by: Paul Burton <paul.burton@mips.com> Thanks, Paul [ This message was auto-generated; if you believe anything is incorrect then please email paul.burton@mips.com to report it. ]
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c index b8249c233754..f5c6b4c6de24 100644 --- a/arch/mips/kernel/setup.c +++ b/arch/mips/kernel/setup.c @@ -321,7 +321,7 @@ static void __init bootmem_init(void) * Reserve any memory between the start of RAM and PHYS_OFFSET */ if (ramstart > PHYS_OFFSET) - memblock_reserve(PHYS_OFFSET, PFN_UP(ramstart) - PHYS_OFFSET); + memblock_reserve(PHYS_OFFSET, ramstart - PHYS_OFFSET); if (PFN_UP(ramstart) > ARCH_PFN_OFFSET) { pr_info("Wasting %lu bytes for tracking %lu unused pages\n",
Fix calculation of the size for reserving memory between PHYS_OFFSET and real memory start. Fixes: a94e4f24ec83 ("MIPS: init: Drop boot_mem_map") Signed-off-by: Thomas Bogendoerfer <tbogendoerfer@suse.de> --- arch/mips/kernel/setup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)