projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kbuild: use getopt_long(), not its _only() variant
[cascardo/linux.git]
/
kernel
/
kexec.c
diff --git
a/kernel/kexec.c
b/kernel/kexec.c
index
474a847
..
131b170
100644
(file)
--- a/
kernel/kexec.c
+++ b/
kernel/kexec.c
@@
-1089,9
+1089,10
@@
void crash_kexec(struct pt_regs *regs)
size_t crash_get_memory_size(void)
{
size_t crash_get_memory_size(void)
{
- size_t size;
+ size_t size
= 0
;
mutex_lock(&kexec_mutex);
mutex_lock(&kexec_mutex);
- size = crashk_res.end - crashk_res.start + 1;
+ if (crashk_res.end != crashk_res.start)
+ size = crashk_res.end - crashk_res.start + 1;
mutex_unlock(&kexec_mutex);
return size;
}
mutex_unlock(&kexec_mutex);
return size;
}
@@
-1134,7
+1135,7
@@
int crash_shrink_memory(unsigned long new_size)
free_reserved_phys_range(end, crashk_res.end);
free_reserved_phys_range(end, crashk_res.end);
- if (
start == end
)
+ if (
(start == end) && (crashk_res.parent != NULL)
)
release_resource(&crashk_res);
crashk_res.end = end - 1;
release_resource(&crashk_res);
crashk_res.end = end - 1;