Patch "MIPS: Reserve nosave data for hibernation" has been added to the 4.5-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
MIPS: Reserve nosave data for hibernation
to the 4.5-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
mips-reserve-nosave-data-for-hibernation.patch
and it can be found in the queue-4.5 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
a95d069204e178f18476f5499abab0d0d9cbc32cMon Sep 17 00:00:00 2001
From: Huacai Chen <[email protected]>
Date: Thu, 17 Mar 2016 20:37:10 +0800
Subject: MIPS: Reserve nosave data for hibernation
From: Huacai Chen <[email protected]>
commit a95d069204e178f18476f5499abab0d0d9cbc32c upstream.
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.
Patchwork: https://patchwork.linux-mips.org/patch/12888/
--- arch/mips/kernel/setup.c | 3 +++ 1 file changed, 3 insertions(+)
arch/mips/kernel/setup.c +3 -0
@@ -706,6 +706,9 @@ static void __init arch_mem_init(char **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 )
Patches currently in stable-queue which might be from [email protected] are
queue-4.5/mips-reserve-nosave-data-for-hibernation.patch queue-4.5/mips-loongson-3-reserve-32mb-for-rs780e-integrated-gpu.patch queue-4.5/mips-loongson-3-fix-build-error-after-ld-version.sh-modification.patch queue-4.5/mips-sync-icache-dcache-in-set_pte_at.patch