Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
arch
/
mips
/
kernel
/
setup.c
diff --git
a/kernel/arch/mips/kernel/setup.c
b/kernel/arch/mips/kernel/setup.c
index
66aac55
..
8acae31
100644
(file)
--- a/
kernel/arch/mips/kernel/setup.c
+++ b/
kernel/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);
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)
}
static void __init resource_init(void)