diff options
| author |   Heiko Carstens <heiko.carstens@de.ibm.com> | 2016-12-27 14:47:42 +0100 |
|---|---|---|
| committer |   Martin Schwidefsky <schwidefsky@de.ibm.com> | 2017-01-16 07:27:53 +0100 |
| commit | 7be5e359a7eaea6ebe761044f6994163f0dd8585 (patch) | |
| tree | 2c169f78af484b53c28314ee8f789833184a5b1f /arch/s390/kernel/setup.c | |
| parent | s390/pci: use proper endianness annotations (diff) | |
| download | linux-dev-7be5e359a7eaea6ebe761044f6994163f0dd8585.tar.xz linux-dev-7be5e359a7eaea6ebe761044f6994163f0dd8585.zip | |
s390/setup: call memblock_reserve only for size > 0
reserve_initrd currently calls memblock_reserve even if the to be
reserved size is zero. Even though the memblock core code can handle
this correctly, it still yields confusing debug messages if
memblock debugging is enabled.
Therefore make sure to not call memblock_reserve with a size of zero.
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/kernel/setup.c')
| -rw-r--r-- | arch/s390/kernel/setup.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c index 865a48871ca4..1a3388c32a83 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c @@ -636,6 +636,8 @@ static void __init reserve_crashkernel(void) static void __init reserve_initrd(void) { #ifdef CONFIG_BLK_DEV_INITRD + if (!INITRD_START || !INITRD_SIZE) + return; initrd_start = INITRD_START; initrd_end = initrd_start + INITRD_SIZE; memblock_reserve(INITRD_START, INITRD_SIZE); |