| commit | 26011267e1a7ddaab50b5f81b402ca3e7fc2887c | [log] [tgz] |
|---|---|---|
| author | David Hildenbrand <[email protected]> | Thu Feb 25 17:17:17 2021 -0800 |
| committer | Linus Torvalds <[email protected]> | Fri Feb 26 09:41:00 2021 -0800 |
| tree | 08345b0bdcd180b7e424085d5c7f382c2eea9225 | |
| parent | 1adf8b468ff6bc64ba01ce3848da4bcf409215b4 [diff] [blame] |
mm/memory_hotplug: MEMHP_MERGE_RESOURCE -> MHP_MERGE_RESOURCE Let's make "MEMHP_MERGE_RESOURCE" consistent with "MHP_NONE", "mhp_t" and "mhp_flags". As discussed recently [1], "mhp" is our internal acronym for memory hotplug now. [1] https://lore.kernel.org/linux-mm/[email protected]/ Link: https://lkml.kernel.org/r/[email protected] Signed-off-by: David Hildenbrand <[email protected]> Reviewed-by: Miaohe Lin <[email protected]> Acked-by: Michael S. Tsirkin <[email protected]> Reviewed-by: Oscar Salvador <[email protected]> Acked-by: Wei Liu <[email protected]> Reviewed-by: Pankaj Gupta <[email protected]> Cc: "K. Y. Srinivasan" <[email protected]> Cc: Haiyang Zhang <[email protected]> Cc: Stephen Hemminger <[email protected]> Cc: Jason Wang <[email protected]> Cc: Boris Ostrovsky <[email protected]> Cc: Juergen Gross <[email protected]> Cc: Stefano Stabellini <[email protected]> Cc: Michal Hocko <[email protected]> Cc: Anshuman Khandual <[email protected]> Cc: Wei Yang <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h index ca5e8d1..08eeef6 100644 --- a/include/linux/memory_hotplug.h +++ b/include/linux/memory_hotplug.h
@@ -53,7 +53,7 @@ typedef int __bitwise mhp_t; * with this flag set, the resource pointer must no longer be used as it * might be stale, or the resource might have changed. */ -#define MEMHP_MERGE_RESOURCE ((__force mhp_t)BIT(0)) +#define MHP_MERGE_RESOURCE ((__force mhp_t)BIT(0)) /* * Extended parameters for memory hotplug: