1 files changed, 4 insertions, 3 deletions

diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index ffe1c53264a7..4444875266ee 100644
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -471,8 +471,9 @@ static void __init setup_memory_end(void)
 
 
 #ifdef CONFIG_ZFCPDUMP
-        if (ipl_info.type == IPL_TYPE_FCP_DUMP && !OLDMEM_BASE) {
-                memory_end = ZFCPDUMP_HSA_SIZE;
+        if (ipl_info.type == IPL_TYPE_FCP_DUMP &&
+            !OLDMEM_BASE && sclp_get_hsa_size()) {
+                memory_end = sclp_get_hsa_size();
                 memory_end_set = 1;
         }
 #endif
@@ -586,7 +587,7 @@ static unsigned long __init find_crash_base(unsigned long crash_size,
                 crash_base = (chunk->addr + chunk->size) - crash_size;
                 if (crash_base < crash_size)
                         continue;
-                if (crash_base < ZFCPDUMP_HSA_SIZE_MAX)
+                if (crash_base < sclp_get_hsa_size())
                         continue;
                 if (crash_base < (unsigned long) INITRD_START + INITRD_SIZE)
                         continue;