diff options
| author | Huacai Chen | 2016-03-17 13:37:10 +0100 |
|---|---|---|
| committer | Ralf Baechle | 2016-05-09 12:00:03 +0200 |
| commit | a95d069204e178f18476f5499abab0d0d9cbc32c (patch) | |
| tree | 7d8221271ce89e4cbd3c5417a6f94c0f27395177 | |
| parent | MIPS: Sibyte: Fix Kconfig dependencies of SIBYTE_BUS_WATCHER (diff) | |
| download | kernel-qcow2-linux-a95d069204e178f18476f5499abab0d0d9cbc32c.tar.gz kernel-qcow2-linux-a95d069204e178f18476f5499abab0d0d9cbc32c.tar.xz kernel-qcow2-linux-a95d069204e178f18476f5499abab0d0d9cbc32c.zip | |
MIPS: Reserve nosave data for hibernation
After commit 92923ca3aacef63c92d ("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: Huacai 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: Ralf Baechle <ralf@linux-mips.org>
| -rw-r--r-- | arch/mips/kernel/setup.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c index 4f607341a793..d20caacfdbd3 100644 --- a/arch/mips/kernel/setup.c +++ b/arch/mips/kernel/setup.c @@ -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) |