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>

diff --git a/arch/s390/kernel/early.c b/arch/s390/kernel/early.c
index f40e1f29361930e9bffe288660d69d5f586607de..4f6527d4747b7476ad0f944f7f9dde5cfbd17d42 100644 (file)
--- 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 */