diff options
| author | Joe Perches | 2019-03-08 00:51:45 +0100 |
|---|---|---|
| committer | Martin Schwidefsky | 2019-03-29 07:23:44 +0100 |
| commit | 2d4ea4b95cae3133de6b18ec5d5a42ee824fa0ef (patch) | |
| tree | fc80d800ddd44bb327805299d5ef2867e15a236c /arch/s390/boot | |
| parent | Merge tag 'pci-v5.1-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| download | kernel-qcow2-linux-2d4ea4b95cae3133de6b18ec5d5a42ee824fa0ef.tar.gz kernel-qcow2-linux-2d4ea4b95cae3133de6b18ec5d5a42ee824fa0ef.tar.xz kernel-qcow2-linux-2d4ea4b95cae3133de6b18ec5d5a42ee824fa0ef.zip | |
s390/mem_detect: Use IS_ENABLED(CONFIG_BLK_DEV_INITRD)
IS_ENABLED should generally use CONFIG_ prefaced symbols and
it doesn't appear as if there is a BLK_DEV_INITRD define.
Cc: <stable@vger.kernel.org> # 4.20
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/boot')
| -rw-r--r-- | arch/s390/boot/mem_detect.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/boot/mem_detect.c b/arch/s390/boot/mem_detect.c index 4cb771ba13fa..5d316fe40480 100644 --- a/arch/s390/boot/mem_detect.c +++ b/arch/s390/boot/mem_detect.c @@ -25,7 +25,7 @@ static void *mem_detect_alloc_extended(void) { unsigned long offset = ALIGN(mem_safe_offset(), sizeof(u64)); - if (IS_ENABLED(BLK_DEV_INITRD) && INITRD_START && INITRD_SIZE && + if (IS_ENABLED(CONFIG_BLK_DEV_INITRD) && INITRD_START && INITRD_SIZE && INITRD_START < offset + ENTRIES_EXTENDED_MAX) offset = ALIGN(INITRD_START + INITRD_SIZE, sizeof(u64)); |