Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

arch/s390/kernel/early.c

+3 −2
Original line number Diff line number Diff line
@@ -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 */