From 32fd2b4bcf6bf68ec45c4ddc4f57056b17e22bd7 Mon Sep 17 00:00:00 2001 From: Heiko Carstens Date: Fri, 4 May 2018 12:58:48 +0200 Subject: s390/early: get rid of #ifdef CONFIG_BLK_DEV_INITRD Use IS_ENABLED to get rid of an #ifdef statement. Reviewed-by: Christian Borntraeger Reviewed-by: Vasily Gorbik Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky --- arch/s390/kernel/early.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'arch/s390/kernel/early.c') 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 */ -- cgit