The mhp_restrictions struct really doesn't specify anything resembling a restriction anymore so rename it to be mhp_params as it is a list of extended parameters.
Showing the changes to include/linux (1 of 10 files). Show all
Unified · Split
| @@ -58,10 +58,10 @@ enum { · 57 unmodified lines | |||
| 58 | }; | 58 | }; |
| 59 | 59 | ||
| 60 | /* | 60 | /* |
| 61 | * Restrictions for the memory hotplug: | 61 | * Extended parameters for memory hotplug: |
| 62 | * altmap: alternative allocator for memmap array | 62 | * altmap: alternative allocator for memmap array (optional) |
| 63 | */ | 63 | */ |
| 64 | struct mhp_restrictions { | 64 | struct mhp_params { |
| 65 | struct vmem_altmap *altmap; | 65 | struct vmem_altmap *altmap; |
| 66 | }; | 66 | }; |
| 67 | 67 | ||
| @@ -112,7 +112,7 @@ extern int restore_online_page_callback(online_page_callback_t callback); · 44 unmodified lines | |||
| 112 | extern int try_online_node(int nid); | 112 | extern int try_online_node(int nid); |
| 113 | 113 | ||
| 114 | extern int arch_add_memory(int nid, u64 start, u64 size, | 114 | extern int arch_add_memory(int nid, u64 start, u64 size, |
| 115 | struct mhp_restrictions *restrictions); | 115 | struct mhp_params *params); |
| 116 | extern u64 max_mem_size; | 116 | extern u64 max_mem_size; |
| 117 | 117 | ||
| 118 | extern int memhp_online_type_from_str(const char *str); | 118 | extern int memhp_online_type_from_str(const char *str); |
| @@ -133,17 +133,17 @@ extern void __remove_pages(unsigned long start_pfn, unsigned long nr_pages, · 14 unmodified lines | |||
| 133 | 133 | ||
| 134 | /* reasonably generic interface to expand the physical pages */ | 134 | /* reasonably generic interface to expand the physical pages */ |
| 135 | extern int __add_pages(int nid, unsigned long start_pfn, unsigned long nr_pages, | 135 | extern int __add_pages(int nid, unsigned long start_pfn, unsigned long nr_pages, |
| 136 | struct mhp_restrictions *restrictions); | 136 | struct mhp_params *params); |
| 137 | 137 | ||
| 138 | #ifndef CONFIG_ARCH_HAS_ADD_PAGES | 138 | #ifndef CONFIG_ARCH_HAS_ADD_PAGES |
| 139 | static inline int add_pages(int nid, unsigned long start_pfn, | 139 | static inline int add_pages(int nid, unsigned long start_pfn, |
| 140 | unsigned long nr_pages, struct mhp_restrictions *restrictions) | 140 | unsigned long nr_pages, struct mhp_params *params) |
| 141 | { | 141 | { |
| 142 | return __add_pages(nid, start_pfn, nr_pages, restrictions); | 142 | return __add_pages(nid, start_pfn, nr_pages, params); |
| 143 | } | 143 | } |
| 144 | #else /* ARCH_HAS_ADD_PAGES */ | 144 | #else /* ARCH_HAS_ADD_PAGES */ |
| 145 | int add_pages(int nid, unsigned long start_pfn, unsigned long nr_pages, | 145 | int add_pages(int nid, unsigned long start_pfn, unsigned long nr_pages, |
| 146 | struct mhp_restrictions *restrictions); | 146 | struct mhp_params *params); |
| 147 | #endif /* ARCH_HAS_ADD_PAGES */ | 147 | #endif /* ARCH_HAS_ADD_PAGES */ |
| 148 | 148 | ||
| 149 | #ifdef CONFIG_NUMA | 149 | #ifdef CONFIG_NUMA |