The patch titled Add IORESOUCE_BUSY flag for System RAM has been removed from the -mm tree. Its filename was add-ioresouce_busy-flag-for-system-ram.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ Subject: Add IORESOUCE_BUSY flag for System RAM From: Yasunori Goto <y-goto@xxxxxxxxxxxxxx> i386 and x86-64 registers System RAM as IORESOURCE_MEM | IORESOURCE_BUSY. But ia64 registers it as IORESOURCE_MEM only. In addition, memory hotplug code registers new memory as IORESOURCE_MEM too. This difference causes a failure of memory unplug of x86-64. This patch fixes it. This patch adds IORESOURCE_BUSY to avoid potential overlap mapping by PCI device. Signed-off-by: Yasunori Goto <y-goto@xxxxxxxxxxxxxx> Signed-off-by: Badari Pulavarty <pbadari@xxxxxxxxxx> Cc: Luck, Tony" <tony.luck@xxxxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/ia64/kernel/efi.c | 6 ++---- kernel/resource.c | 2 +- mm/memory_hotplug.c | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff -puN arch/ia64/kernel/efi.c~add-ioresouce_busy-flag-for-system-ram arch/ia64/kernel/efi.c --- a/arch/ia64/kernel/efi.c~add-ioresouce_busy-flag-for-system-ram +++ a/arch/ia64/kernel/efi.c @@ -1113,7 +1113,7 @@ efi_initialize_iomem_resources(struct re if (md->num_pages == 0) /* should not happen */ continue; - flags = IORESOURCE_MEM; + flags = IORESOURCE_MEM | IORESOURCE_BUSY; switch (md->type) { case EFI_MEMORY_MAPPED_IO: @@ -1135,12 +1135,11 @@ efi_initialize_iomem_resources(struct re case EFI_ACPI_MEMORY_NVS: name = "ACPI Non-volatile Storage"; - flags |= IORESOURCE_BUSY; break; case EFI_UNUSABLE_MEMORY: name = "reserved"; - flags |= IORESOURCE_BUSY | IORESOURCE_DISABLED; + flags |= IORESOURCE_DISABLED; break; case EFI_RESERVED_TYPE: @@ -1149,7 +1148,6 @@ efi_initialize_iomem_resources(struct re case EFI_ACPI_RECLAIM_MEMORY: default: name = "reserved"; - flags |= IORESOURCE_BUSY; break; } diff -puN kernel/resource.c~add-ioresouce_busy-flag-for-system-ram kernel/resource.c --- a/kernel/resource.c~add-ioresouce_busy-flag-for-system-ram +++ a/kernel/resource.c @@ -277,7 +277,7 @@ walk_memory_resource(unsigned long start int ret = -1; res.start = (u64) start_pfn << PAGE_SHIFT; res.end = ((u64)(start_pfn + nr_pages) << PAGE_SHIFT) - 1; - res.flags = IORESOURCE_MEM; + res.flags = IORESOURCE_MEM | IORESOURCE_BUSY; orig_end = res.end; while ((res.start < res.end) && (find_next_system_ram(&res) >= 0)) { pfn = (unsigned long)(res.start >> PAGE_SHIFT); diff -puN mm/memory_hotplug.c~add-ioresouce_busy-flag-for-system-ram mm/memory_hotplug.c --- a/mm/memory_hotplug.c~add-ioresouce_busy-flag-for-system-ram +++ a/mm/memory_hotplug.c @@ -39,7 +39,7 @@ static struct resource *register_memory_ res->name = "System RAM"; res->start = start; res->end = start + size - 1; - res->flags = IORESOURCE_MEM; + res->flags = IORESOURCE_MEM | IORESOURCE_BUSY; if (request_resource(&iomem_resource, res) < 0) { printk("System RAM resource %llx - %llx cannot be added\n", (unsigned long long)res->start, (unsigned long long)res->end); _ Patches currently in -mm which might be from y-goto@xxxxxxxxxxxxxx are origin.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html