ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 20:51:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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: Anshuman Khandual <anshuman.khandual@arm.com>
Suggested-by: David Hildenbrand <david@redhat.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: "Rafael J. Wysocki" <rafael@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Anshuman Khandual
2021-02-25 17:17:13 -08:00
committed by Linus Torvalds
parent 34dc45be45
commit 1adf8b468f
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/base/memory.c
View File

@@ -35,7 +35,7 @@ static const char *const online_type_to_str[] = {
[MMOP_ONLINE_MOVABLE] = "online_movable", [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; 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, static ssize_t state_store(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count) 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); struct memory_block *mem = to_memory_block(dev);
int ret; int ret;
@@ -387,19 +387,19 @@ static ssize_t auto_online_blocks_show(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
return sysfs_emit(buf, "%s\n", 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, static ssize_t auto_online_blocks_store(struct device *dev,
struct device_attribute *attr, struct device_attribute *attr,
const char *buf, size_t count) 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) if (online_type < 0)
return -EINVAL; return -EINVAL;
memhp_default_online_type = online_type; mhp_default_online_type = online_type;
return count; return count;
} }

4
include/linux/memory_hotplug.h
View File

@@ -116,10 +116,10 @@ extern int arch_add_memory(int nid, u64 start, u64 size,
struct mhp_params *params); struct mhp_params *params);
extern u64 max_mem_size; 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. */ /* 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 */ /* If movable_node boot option specified */
extern bool movable_node_enabled; extern bool movable_node_enabled;
static inline bool movable_node_is_enabled(void) static inline bool movable_node_is_enabled(void)

12
mm/memory_hotplug.c
View File

@@ -67,17 +67,17 @@ void put_online_mems(void)
bool movable_node_enabled = false; bool movable_node_enabled = false;
#ifndef CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE #ifndef CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE
int memhp_default_online_type = MMOP_OFFLINE; int mhp_default_online_type = MMOP_OFFLINE;
#else #else
int memhp_default_online_type = MMOP_ONLINE; int mhp_default_online_type = MMOP_ONLINE;
#endif #endif
static int __init setup_memhp_default_state(char *str) 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) if (online_type >= 0)
memhp_default_online_type = online_type; mhp_default_online_type = online_type;
return 1; 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) 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); 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); merge_system_ram_resource(res);
/* online pages if requested */ /* 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); walk_memory_blocks(start, size, NULL, online_memory_block);
return ret; return ret;