Merge tag 's390-5.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

[linux-2.6-microblaze.git] / arch / s390 / kernel / smp.c

diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c
index b8eb996..bd197ba 100644 (file)
--- a/arch/s390/kernel/smp.c
+++ b/arch/s390/kernel/smp.c
@@ -657,7 +657,11 @@ void __init smp_save_dump_cpus(void)
                /* No previous system present, normal boot. */
                return;
        /* Allocate a page as dumping area for the store status sigps */
-       page = memblock_alloc_base(PAGE_SIZE, PAGE_SIZE, 1UL << 31);
+       page = memblock_phys_alloc_range(PAGE_SIZE, PAGE_SIZE, 0, 1UL << 31);
+       if (!page)
+               panic("ERROR: Failed to allocate %lx bytes below %lx\n",
+                     PAGE_SIZE, 1UL << 31);
+
        /* Set multi-threading state to the previous system. */
        pcpu_set_smt(sclp.mtid_prev);
        boot_cpu_addr = stap();
@@ -767,6 +771,9 @@ void __init smp_detect_cpus(void)
 
        /* Get CPU information */
        info = memblock_alloc(sizeof(*info), 8);
+       if (!info)
+               panic("%s: Failed to allocate %zu bytes align=0x%x\n",
+                     __func__, sizeof(*info), 8);
        smp_get_core_info(info, 1);
        /* Find boot CPU type */
        if (sclp.has_core_type) {