Commit 32fd2b4b authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky

s390/early: get rid of #ifdef CONFIG_BLK_DEV_INITRD

Use IS_ENABLED to get rid of an #ifdef statement.
Reviewed-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: default avatarVasily Gorbik <gor@linux.ibm.com>
Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 1155a26a
...@@ -312,21 +312,22 @@ early_param("cad", cad_setup); ...@@ -312,21 +312,22 @@ early_param("cad", cad_setup);
static __init noinline void rescue_initrd(void) static __init noinline void rescue_initrd(void)
{ {
#ifdef CONFIG_BLK_DEV_INITRD
unsigned long min_initrd_addr = (unsigned long) _end + (4UL << 20); 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 * 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. * gap of 4MB between end of kernel and start of initrd.
* That way we can also be sure that saving an NSS will succeed, * That way we can also be sure that saving an NSS will succeed,
* which however only requires different segments. * which however only requires different segments.
*/ */
if (!IS_ENABLED(CONFIG_BLK_DEV_INITRD))
return;
if (!INITRD_START || !INITRD_SIZE) if (!INITRD_START || !INITRD_SIZE)
return; return;
if (INITRD_START >= min_initrd_addr) if (INITRD_START >= min_initrd_addr)
return; return;
memmove((void *) min_initrd_addr, (void *) INITRD_START, INITRD_SIZE); memmove((void *) min_initrd_addr, (void *) INITRD_START, INITRD_SIZE);
INITRD_START = min_initrd_addr; INITRD_START = min_initrd_addr;
#endif
} }
/* Set up boot command line */ /* Set up boot command line */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment