The patch titled
Subject: resource: update config option of release_mem_region_adjustable()
has been removed from the -mm tree. Its filename was
resource-add-release_mem_region_adjustable-fix-fix-fix-fix.patch
This patch was dropped because it was folded into resource-add-release_mem_region_adjustable.patch
------------------------------------------------------
From: Toshi Kani <toshi.kani@xxxxxx>
Subject: resource: update config option of release_mem_region_adjustable()
Change the config option of release_mem_region_adjustable() from
CONFIG_MEMORY_HOTPLUG to CONFIG_MEMORY_HOTREMOVE since this function
is only used for memory hot-delete.
Signed-off-by: Toshi Kani <toshi.kani@xxxxxx>
Suggested-by: David Rientjes <rientjes@xxxxxxxxxx>
Acked-by: David Rientjes <rientjes@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/ioport.h | 2 +-
kernel/resource.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff -puN include/linux/ioport.h~resource-add-release_mem_region_adjustable-fix-fix-fix-fix include/linux/ioport.h
--- a/include/linux/ioport.h~resource-add-release_mem_region_adjustable-fix-fix-fix-fix
+++ a/include/linux/ioport.h
@@ -192,7 +192,7 @@ extern struct resource * __request_regio
extern int __check_region(struct resource *, resource_size_t, resource_size_t);
extern void __release_region(struct resource *, resource_size_t,
resource_size_t);
-#ifdef CONFIG_MEMORY_HOTPLUG
+#ifdef CONFIG_MEMORY_HOTREMOVE
extern int release_mem_region_adjustable(struct resource *, resource_size_t,
resource_size_t);
#endif
diff -puN kernel/resource.c~resource-add-release_mem_region_adjustable-fix-fix-fix-fix kernel/resource.c
--- a/kernel/resource.c~resource-add-release_mem_region_adjustable-fix-fix-fix-fix
+++ a/kernel/resource.c
@@ -1021,7 +1021,7 @@ void __release_region(struct resource *p
}
EXPORT_SYMBOL(__release_region);
-#ifdef CONFIG_MEMORY_HOTPLUG
+#ifdef CONFIG_MEMORY_HOTREMOVE
/**
* release_mem_region_adjustable - release a previously reserved memory region
* @parent: parent resource descriptor
@@ -1122,7 +1122,7 @@ int release_mem_region_adjustable(struct
kfree(new_res);
return ret;
}
-#endif /* CONFIG_MEMORY_HOTPLUG */
+#endif /* CONFIG_MEMORY_HOTREMOVE */
/*
* Managed region resource
_
Patches currently in -mm which might be from toshi.kani@xxxxxx are
origin.patch
mm-walk_memory_range-fix-typo-in-comment.patch
resource-add-__adjust_resource-for-internal-use.patch
resource-add-release_mem_region_adjustable.patch
mm-change-__remove_pages-to-call-release_mem_region_adjustable.patch
mm-hotplug-avoid-compiling-memory-hotremove-functions-when-disabled.patch
firmware-memmap-fix-firmware_map_entry-leak.patch
mem-hotunplug-fix-kfree-of-bootmem-memory.patch
mem-hotunplug-fix-kfree-of-bootmem-memory-fix.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
