diff options
author | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2016-12-13 10:19:11 -0500 |
---|---|---|
committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2016-12-14 10:33:40 -0500 |
commit | 6d7b2ee9d56af3d17d88b0f43b7dc14ee38161b7 (patch) | |
tree | 080b012cc3a77e389df7c8d8544dff2e686612d1 | |
parent | 50cff5adcf8eb8bcdd79087a91878f298fb58dcf (diff) |
s390/setup: reword printk messages
Two of the messages introduced by the memblock conversion are reworded.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
-rw-r--r-- | arch/s390/kernel/setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c index adfac9f0a89f..865a48871ca4 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c | |||
@@ -485,7 +485,7 @@ static void __init setup_memory_end(void) | |||
485 | max_pfn = max_low_pfn = PFN_DOWN(memory_end); | 485 | max_pfn = max_low_pfn = PFN_DOWN(memory_end); |
486 | memblock_remove(memory_end, ULONG_MAX); | 486 | memblock_remove(memory_end, ULONG_MAX); |
487 | 487 | ||
488 | pr_notice("Max memory size: %luMB\n", memory_end >> 20); | 488 | pr_notice("The maximum memory size is %luMB\n", memory_end >> 20); |
489 | } | 489 | } |
490 | 490 | ||
491 | static void __init setup_vmcoreinfo(void) | 491 | static void __init setup_vmcoreinfo(void) |
@@ -650,7 +650,7 @@ static void __init check_initrd(void) | |||
650 | #ifdef CONFIG_BLK_DEV_INITRD | 650 | #ifdef CONFIG_BLK_DEV_INITRD |
651 | if (INITRD_START && INITRD_SIZE && | 651 | if (INITRD_START && INITRD_SIZE && |
652 | !memblock_is_region_memory(INITRD_START, INITRD_SIZE)) { | 652 | !memblock_is_region_memory(INITRD_START, INITRD_SIZE)) { |
653 | pr_err("initrd does not fit memory.\n"); | 653 | pr_err("The initial RAM disk does not fit into the memory\n"); |
654 | memblock_free(INITRD_START, INITRD_SIZE); | 654 | memblock_free(INITRD_START, INITRD_SIZE); |
655 | initrd_start = initrd_end = 0; | 655 | initrd_start = initrd_end = 0; |
656 | } | 656 | } |