summaryrefslogtreecommitdiff
path: root/arch/s390/kernel
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2018-05-04 12:58:48 +0200
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2018-05-09 10:55:01 +0200
commit32fd2b4bcf6bf68ec45c4ddc4f57056b17e22bd7 (patch)
treef340e7906d0527bfba4609c7cf76763f189a3a28 /arch/s390/kernel
parent1155a26a25af2c4d1f32caa3d4bae46a1c07cf73 (diff)
s390/early: get rid of #ifdef CONFIG_BLK_DEV_INITRD
Use IS_ENABLED to get rid of an #ifdef statement. Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com> Reviewed-by: Vasily Gorbik <gor@linux.ibm.com> Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/kernel')
-rw-r--r--arch/s390/kernel/early.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/s390/kernel/early.c b/arch/s390/kernel/early.c
index f40e1f293619..4f6527d4747b 100644
--- a/arch/s390/kernel/early.c
+++ b/arch/s390/kernel/early.c
@@ -312,21 +312,22 @@ early_param("cad", cad_setup);
static __init noinline void rescue_initrd(void)
{
-#ifdef CONFIG_BLK_DEV_INITRD
unsigned long min_initrd_addr = (unsigned long) _end + (4UL << 20);
+
/*
* Just like in case of IPL from VM reader we make sure there is a
* gap of 4MB between end of kernel and start of initrd.
* That way we can also be sure that saving an NSS will succeed,
* which however only requires different segments.
*/
+ if (!IS_ENABLED(CONFIG_BLK_DEV_INITRD))
+ return;
if (!INITRD_START || !INITRD_SIZE)
return;
if (INITRD_START >= min_initrd_addr)
return;
memmove((void *) min_initrd_addr, (void *) INITRD_START, INITRD_SIZE);
INITRD_START = min_initrd_addr;
-#endif
}
/* Set up boot command line */