Commit cb8e3c8b authored by David Hildenbrand's avatar David Hildenbrand Committed by Linus Torvalds
Browse files

kernel/resource: make iomem_resource implicit in release_mem_region_adjustable() 



"mem" in the name already indicates the root, similar to
release_mem_region() and devm_request_mem_region().  Make it implicit.
The only single caller always passes iomem_resource, other parents are not
applicable.

Suggested-by: default avatarWei Yang <richard.weiyang@linux.alibaba.com>
Signed-off-by: default avatarDavid Hildenbrand <david@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Reviewed-by: default avatarWei Yang <richard.weiyang@linux.alibaba.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Jason Gunthorpe <jgg@ziepe.ca>
Cc: Kees Cook <keescook@chromium.org>
Cc: Ard Biesheuvel <ardb@kernel.org>
Cc: Pankaj Gupta <pankaj.gupta.linux@gmail.com>
Cc: Baoquan He <bhe@redhat.com>
Link: https://lkml.kernel.org/r/20200916073041.10355-1-david@redhat.com


Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 2c76e7f6

include/linux/ioport.h

+1 −2
Original line number Diff line number Diff line
@@ -251,8 +251,7 @@ extern struct resource * __request_region(struct resource *, 
extern void __release_region(struct resource *, resource_size_t,

				resource_size_t);

#ifdef CONFIG_MEMORY_HOTREMOVE

extern void release_mem_region_adjustable(struct resource *, resource_size_t,

					  resource_size_t);

extern void release_mem_region_adjustable(resource_size_t, resource_size_t);

#endif

#ifdef CONFIG_MEMORY_HOTPLUG

extern void merge_system_ram_resource(struct resource *res);

kernel/resource.c

+2 −3
Original line number Diff line number Diff line
@@ -1240,7 +1240,6 @@ EXPORT_SYMBOL(__release_region); 
#ifdef CONFIG_MEMORY_HOTREMOVE

/**

 * release_mem_region_adjustable - release a previously reserved memory region

 * @parent: parent resource descriptor

 * @start: resource start address

 * @size: resource region size

 *
@@ -1258,9 +1257,9 @@ EXPORT_SYMBOL(__release_region); 
 *   assumes that all children remain in the lower address entry for

 *   simplicity.  Enhance this logic when necessary.

 */

void release_mem_region_adjustable(struct resource *parent,

				   resource_size_t start, resource_size_t size)

void release_mem_region_adjustable(resource_size_t start, resource_size_t size)

{

	struct resource *parent = &iomem_resource;

	struct resource *new_res = NULL;

	bool alloc_nofail = false;

	struct resource **p;

mm/memory_hotplug.c

+1 −1
Original line number Diff line number Diff line
@@ -1767,7 +1767,7 @@ static int __ref try_remove_memory(int nid, u64 start, u64 size) 
		memblock_remove(start, size);

	}



	release_mem_region_adjustable(&iomem_resource, start, size);

	release_mem_region_adjustable(start, size);



	try_offline_node(nid);

CRA Git | Maintained and supported by SUSTech CRA and CCSE