releases/5.0.10/s390-mem_detect-use-is_enabled-config_blk_dev_initrd.patch

   1 From 2d4ea4b95cae3133de6b18ec5d5a42ee824fa0ef Mon Sep 17 00:00:00 2001
   2 From: Joe Perches <joe@perches.com>
   3 Date: Thu, 7 Mar 2019 15:51:45 -0800
   4 Subject: s390/mem_detect: Use IS_ENABLED(CONFIG_BLK_DEV_INITRD)
   5
   6 From: Joe Perches <joe@perches.com>
   7
   8 commit 2d4ea4b95cae3133de6b18ec5d5a42ee824fa0ef upstream.
   9
  10 IS_ENABLED should generally use CONFIG_ prefaced symbols and
  11 it doesn't appear as if there is a BLK_DEV_INITRD define.
  12
  13 Cc: <stable@vger.kernel.org> # 4.20
  14 Signed-off-by: Joe Perches <joe@perches.com>
  15 Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
  16 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  17
  18 ---
  19  arch/s390/boot/mem_detect.c |    2 +-
  20  1 file changed, 1 insertion(+), 1 deletion(-)
  21
  22 --- a/arch/s390/boot/mem_detect.c
  23 +++ b/arch/s390/boot/mem_detect.c
  24 @@ -25,7 +25,7 @@ static void *mem_detect_alloc_extended(v
  25  {
  26         unsigned long offset = ALIGN(mem_safe_offset(), sizeof(u64));
  27
  28 -       if (IS_ENABLED(BLK_DEV_INITRD) && INITRD_START && INITRD_SIZE &&
  29 +       if (IS_ENABLED(CONFIG_BLK_DEV_INITRD) && INITRD_START && INITRD_SIZE &&
  30             INITRD_START < offset + ENTRIES_EXTENDED_MAX)
  31                 offset = ALIGN(INITRD_START + INITRD_SIZE, sizeof(u64));
  32