1 files changed, 8 insertions, 3 deletions

diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c
index 536dce22fe76..f534f492a268 100644
--- a/arch/arm64/kernel/setup.c
+++ b/arch/arm64/kernel/setup.c
@@ -206,10 +206,15 @@ static void __init request_standard_resources(void)
 
         for_each_memblock(memory, region) {
                 res = alloc_bootmem_low(sizeof(*res));
-                res->name  = "System RAM";
+                if (memblock_is_nomap(region)) {
+                        res->name  = "reserved";
+                        res->flags = IORESOURCE_MEM | IORESOURCE_BUSY;
+                } else {
+                        res->name  = "System RAM";
+                        res->flags = IORESOURCE_SYSTEM_RAM | IORESOURCE_BUSY;
+                }
                 res->start = __pfn_to_phys(memblock_region_memory_base_pfn(region));
                 res->end = __pfn_to_phys(memblock_region_memory_end_pfn(region)) - 1;
-                res->flags = IORESOURCE_SYSTEM_RAM | IORESOURCE_BUSY;
 
                 request_resource(&iomem_resource, res);
 
@@ -228,7 +233,7 @@ void __init setup_arch(char **cmdline_p)
 {
         pr_info("Boot CPU: AArch64 Processor [%08x]\n", read_cpuid_id());
 
-        sprintf(init_utsname()->machine, ELF_PLATFORM);
+        sprintf(init_utsname()->machine, UTS_MACHINE);
         init_mm.start_code = (unsigned long) _text;
         init_mm.end_code   = (unsigned long) _etext;
         init_mm.end_data   = (unsigned long) _edata;