projects
/
platform
/
kernel
/
linux-starfive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-florian' of git://gitorious.org/linux-omap-dss2/linux into fbdev...
[platform/kernel/linux-starfive.git]
/
arch
/
s390
/
kernel
/
setup.c
diff --git
a/arch/s390/kernel/setup.c
b/arch/s390/kernel/setup.c
index
e58a462
..
e54c4ff
100644
(file)
--- a/
arch/s390/kernel/setup.c
+++ b/
arch/s390/kernel/setup.c
@@
-579,7
+579,7
@@
static unsigned long __init find_crash_base(unsigned long crash_size,
*msg = "first memory chunk must be at least crashkernel size";
return 0;
}
- if (
is_kdump_kernel() && (crash_size == OLDMEM_SIZE)
)
+ if (
OLDMEM_BASE && crash_size == OLDMEM_SIZE
)
return OLDMEM_BASE;
for (i = MEMORY_CHUNKS - 1; i >= 0; i--) {