Commit 1adf8b46 authored by Anshuman Khandual's avatar Anshuman Khandual Committed by Linus Torvalds
Browse files

mm/memory_hotplug: rename all existing 'memhp' into 'mhp' 

This renames all 'memhp' instances to 'mhp' except for memhp_default_state
for being a kernel command line option.  This is just a clean up and
should not cause a functional change.  Let's make it consistent rater than
mixing the two prefixes.  In preparation for more users of the 'mhp'
terminology.

Link: https://lkml.kernel.org/r/1611554093-27316-1-git-send-email-anshuman.khandual@arm.com


Signed-off-by: default avatarAnshuman Khandual <anshuman.khandual@arm.com>
Suggested-by: default avatarDavid Hildenbrand <david@redhat.com>
Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: "Rafael J. Wysocki" <rafael@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 34dc45be

drivers/base/memory.c

+5 −5
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ static const char *const online_type_to_str[] = { 
	[MMOP_ONLINE_MOVABLE] = "online_movable",

};



int memhp_online_type_from_str(const char *str)

int mhp_online_type_from_str(const char *str)

{

	int i;
@@ -253,7 +253,7 @@ static int memory_subsys_offline(struct device *dev) 
static ssize_t state_store(struct device *dev, struct device_attribute *attr,

			   const char *buf, size_t count)

{

	const int online_type = memhp_online_type_from_str(buf);

	const int online_type = mhp_online_type_from_str(buf);

	struct memory_block *mem = to_memory_block(dev);

	int ret;
@@ -387,19 +387,19 @@ static ssize_t auto_online_blocks_show(struct device *dev, 
				       struct device_attribute *attr, char *buf)

{

	return sysfs_emit(buf, "%s\n",

			  online_type_to_str[memhp_default_online_type]);

			  online_type_to_str[mhp_default_online_type]);

}



static ssize_t auto_online_blocks_store(struct device *dev,

					struct device_attribute *attr,

					const char *buf, size_t count)

{

	const int online_type = memhp_online_type_from_str(buf);

	const int online_type = mhp_online_type_from_str(buf);



	if (online_type < 0)

		return -EINVAL;



	memhp_default_online_type = online_type;

	mhp_default_online_type = online_type;

	return count;

}

include/linux/memory_hotplug.h

+2 −2
Original line number Diff line number Diff line
@@ -116,10 +116,10 @@ extern int arch_add_memory(int nid, u64 start, u64 size, 
			   struct mhp_params *params);

extern u64 max_mem_size;



extern int memhp_online_type_from_str(const char *str);

extern int mhp_online_type_from_str(const char *str);



/* Default online_type (MMOP_*) when new memory blocks are added. */

extern int memhp_default_online_type;

extern int mhp_default_online_type;

/* If movable_node boot option specified */

extern bool movable_node_enabled;

static inline bool movable_node_is_enabled(void)

mm/memory_hotplug.c

+6 −6
Original line number Diff line number Diff line
@@ -67,17 +67,17 @@ void put_online_mems(void) 
bool movable_node_enabled = false;



#ifndef CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE

int memhp_default_online_type = MMOP_OFFLINE;

int mhp_default_online_type = MMOP_OFFLINE;

#else

int memhp_default_online_type = MMOP_ONLINE;

int mhp_default_online_type = MMOP_ONLINE;

#endif



static int __init setup_memhp_default_state(char *str)

{

	const int online_type = memhp_online_type_from_str(str);

	const int online_type = mhp_online_type_from_str(str);



	if (online_type >= 0)

		memhp_default_online_type = online_type;

		mhp_default_online_type = online_type;



	return 1;

}
@@ -1076,7 +1076,7 @@ static int check_hotplug_memory_range(u64 start, u64 size) 


static int online_memory_block(struct memory_block *mem, void *arg)

{

	mem->online_type = memhp_default_online_type;

	mem->online_type = mhp_default_online_type;

	return device_online(&mem->dev);

}
@@ -1157,7 +1157,7 @@ int __ref add_memory_resource(int nid, struct resource *res, mhp_t mhp_flags) 
		merge_system_ram_resource(res);



	/* online pages if requested */

	if (memhp_default_online_type != MMOP_OFFLINE)

	if (mhp_default_online_type != MMOP_OFFLINE)

		walk_memory_blocks(start, size, NULL, online_memory_block);



	return ret;