aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390/boot/startup.c
diff options
context:
space:
mode:
authorVasily Gorbik <gor@linux.ibm.com>2018-04-11 11:56:55 +0200
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2018-10-09 11:21:08 +0200
commit6966d604e2ec4ecf5691aea953538f63597a250d (patch)
treebb97b41e8ee7ead33cb952f690820f13d4dd8ab6 /arch/s390/boot/startup.c
parents390/sclp: move sclp_early_read_info to sclp_early_core.c (diff)
downloadlinux-dev-6966d604e2ec4ecf5691aea953538f63597a250d.tar.xz
linux-dev-6966d604e2ec4ecf5691aea953538f63597a250d.zip
s390/mem_detect: move tprot loop to early boot phase
Move memory detection to early boot phase. To store online memory regions "struct mem_detect_info" has been introduced together with for_each_mem_detect_block iterator. mem_detect_info is later converted to memblock. Also introduces sclp_early_get_meminfo function to get maximum physical memory and maximum increment number. Reviewed-by: Heiko Carstens <heiko.carstens@de.ibm.com> Reviewed-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Vasily Gorbik <gor@linux.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/boot/startup.c')
-rw-r--r--arch/s390/boot/startup.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/s390/boot/startup.c b/arch/s390/boot/startup.c
index 78651a2c26b0..b0e9f4619203 100644
--- a/arch/s390/boot/startup.c
+++ b/arch/s390/boot/startup.c
@@ -51,6 +51,7 @@ void startup_kernel(void)
rescue_initrd();
sclp_early_read_info();
+ detect_memory();
if (!IS_ENABLED(CONFIG_KERNEL_UNCOMPRESSED)) {
img = decompress_kernel();
memmove((void *)vmlinux.default_lma, img, vmlinux.image_size);