Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a95d0692 authored by Huacai Chen's avatar Huacai Chen Committed by Ralf Baechle
Browse files

MIPS: Reserve nosave data for hibernation 



After commit 92923ca3 ("mm: meminit: only set page reserved
in the memblock region"), the MIPS hibernation is broken. Because pages
in nosave data section should be "reserved", but currently they aren't
set to "reserved" at initialization. This patch makes hibernation work
again.

Signed-off-by: default avatarHuacai Chen <chenhc@lemote.com>
Cc: Aurelien Jarno <aurelien@aurel32.net>
Cc: Steven J . Hill <sjhill@realitydiluted.com>
Cc: Fuxin Zhang <zhangfx@lemote.com>
Cc: Zhangjin Wu <wuzhangjin@gmail.com>
Cc: linux-mips@linux-mips.org
Cc: stable@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/12888/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 54292850

arch/mips/kernel/setup.c

+3 −0
Original line number Diff line number Diff line
@@ -706,6 +706,9 @@ static void __init arch_mem_init(char **cmdline_p) 
	for_each_memblock(reserved, reg)

		if (reg->size != 0)

			reserve_bootmem(reg->base, reg->size, BOOTMEM_DEFAULT);



	reserve_bootmem_region(__pa_symbol(&__nosave_begin),

			__pa_symbol(&__nosave_end)); /* Reserve for hibernation */

}



static void __init resource_init(void)