diff options
| author | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2016-12-13 16:19:11 +0100 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2016-12-14 16:33:40 +0100 |
| commit | 6d7b2ee9d56af3d17d88b0f43b7dc14ee38161b7 (patch) | |
| tree | 080b012cc3a77e389df7c8d8544dff2e686612d1 /arch/s390/kernel/setup.c | |
| parent | 50cff5adcf8eb8bcdd79087a91878f298fb58dcf (diff) | |
| download | linux-6d7b2ee9d56af3d17d88b0f43b7dc14ee38161b7.tar.gz linux-6d7b2ee9d56af3d17d88b0f43b7dc14ee38161b7.tar.bz2 linux-6d7b2ee9d56af3d17d88b0f43b7dc14ee38161b7.zip | |
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>
Diffstat (limited to 'arch/s390/kernel/setup.c')
| -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) max_pfn = max_low_pfn = PFN_DOWN(memory_end); memblock_remove(memory_end, ULONG_MAX); - pr_notice("Max memory size: %luMB\n", memory_end >> 20); + pr_notice("The maximum memory size is %luMB\n", memory_end >> 20); } static void __init setup_vmcoreinfo(void) @@ -650,7 +650,7 @@ static void __init check_initrd(void) #ifdef CONFIG_BLK_DEV_INITRD if (INITRD_START && INITRD_SIZE && !memblock_is_region_memory(INITRD_START, INITRD_SIZE)) { - pr_err("initrd does not fit memory.\n"); + pr_err("The initial RAM disk does not fit into the memory\n"); memblock_free(INITRD_START, INITRD_SIZE); initrd_start = initrd_end = 0; } |