The patch titled Subject: mm/memory_hotplug: allow arch override of non boot memory resource names has been removed from the -mm tree. Its filename was mm-memory_hotplug-allow-arch-override-of-non-boot-memory-resource-names.patch This patch was dropped because an updated version will be merged ------------------------------------------------------ From: James Morse <james.morse@xxxxxxx> Subject: mm/memory_hotplug: allow arch override of non boot memory resource names Memory added to the system by hotplug has a 'System RAM' resource created for it. This is exposed to user-space via /proc/iomem. This poses problems for kexec on arm64. If kexec decides to place the kernel in one of these newly onlined regions, the new kernel will find itself booting from a region not described as memory in the firmware tables. Arm64 doesn't have a structure like the e820 memory map that can be re-written when memory is brought online. Instead arm64 uses the UEFI memory map, or the memory node from the DT, sometimes both. We never rewrite these. Allow an architecture to specify a different name for these hotplug regions. Link: http://lkml.kernel.org/r/20200326180730.4754-3-james.morse@xxxxxxx Signed-off-by: James Morse <james.morse@xxxxxxx> Reviewed-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Cc: Anshuman Khandual <anshuman.khandual@xxxxxxx> Cc: Bhupesh Sharma <bhsharma@xxxxxxxxxx> Cc: Catalin Marinas <catalin.marinas@xxxxxxx> Cc: David Hildenbrand <david@xxxxxxxxxx> Cc: Eric Biederman <ebiederm@xxxxxxxxxxxx> Cc: Will Deacon <will@xxxxxxxxxx> Cc: Michal Hocko <mhocko@xxxxxxxxxx> Cc: piliu <piliu@xxxxxxxxxx> Cc: Dave Young <dyoung@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/memory_hotplug.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) --- a/mm/memory_hotplug.c~mm-memory_hotplug-allow-arch-override-of-non-boot-memory-resource-names +++ a/mm/memory_hotplug.c @@ -42,6 +42,10 @@ #include "internal.h" #include "shuffle.h" +#ifndef MEMORY_HOTPLUG_RES_NAME +#define MEMORY_HOTPLUG_RES_NAME "System RAM" +#endif + /* * online_page_callback contains pointer to current page onlining function. * Initially it is generic_online_page(). If it is required it could be @@ -104,7 +108,7 @@ static struct resource *register_memory_ struct resource *res; unsigned long flags = IORESOURCE_SYSTEM_RAM | IORESOURCE_BUSY; - if (strcmp(resource_name, "System RAM")) + if (strcmp(resource_name, MEMORY_HOTPLUG_RES_NAME)) flags |= IORESOURCE_MEM_DRIVER_MANAGED; /* _ Patches currently in -mm which might be from james.morse@xxxxxxx are arm64-memory-give-hotplug-memory-a-different-resource-name.patch