ARM64: PCI: Fix struct acpi_pci_root_ops allocation failure path

[karo-tx-linux.git] / arch / arm64 / kernel / setup.c

diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c
index 42274bda0ccb5aa1690183ab2093de9fa5bb9009..2c822ef94f341417624fa6c89253b98e77229875 100644 (file)
--- a/arch/arm64/kernel/setup.c
+++ b/arch/arm64/kernel/setup.c
@@ -31,7 +31,6 @@
 #include <linux/screen_info.h>
 #include <linux/init.h>
 #include <linux/kexec.h>
-#include <linux/crash_dump.h>
 #include <linux/root_dev.h>
 #include <linux/cpu.h>
 #include <linux/interrupt.h>
@@ -181,6 +180,7 @@ static void __init smp_build_mpidr_hash(void)
 static void __init setup_machine_fdt(phys_addr_t dt_phys)
 {
        void *dt_virt = fixmap_remap_fdt(dt_phys);
+       const char *name;
 
        if (!dt_virt || !early_init_dt_scan(dt_virt)) {
                pr_crit("\n"
@@ -193,7 +193,9 @@ static void __init setup_machine_fdt(phys_addr_t dt_phys)
                        cpu_relax();
        }
 
-       dump_stack_set_arch_desc("%s (DT)", of_flat_dt_get_machine_name());
+       name = of_flat_dt_get_machine_name();
+       pr_info("Machine model: %s\n", name);
+       dump_stack_set_arch_desc("%s (DT)", name);
 }
 
 static void __init request_standard_resources(void)
@@ -226,6 +228,12 @@ static void __init request_standard_resources(void)
                if (kernel_data.start >= res->start &&
                    kernel_data.end <= res->end)
                        request_resource(res, &kernel_data);
+#ifdef CONFIG_KEXEC_CORE
+               /* Userspace will find "Crash kernel" region in /proc/iomem. */
+               if (crashk_res.end && crashk_res.start >= res->start &&
+                   crashk_res.end <= res->end)
+                       request_resource(res, &crashk_res);
+#endif
        }
 }