diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2023-09-06 00:08:14 +0300 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2023-09-06 00:08:14 +0300 |
| commit | 34069d12e239ae8f36dd96c378e4622fb1c42a76 (patch) | |
| tree | b33fabf1a4cc7530e93ab416f3156bdfe601a3a0 /include/linux/memory_hotplug.h | |
| parent | 54116d442e001e1b6bd482122043b1870998a1f3 (diff) | |
| parent | 2dde18cd1d8fac735875f2e4987f11817cc0bc2c (diff) | |
| download | linux-34069d12e239ae8f36dd96c378e4622fb1c42a76.tar.xz | |
Merge tag 'v6.5' into next
Sync up with mainline to bring in updates to the shared infrastructure.
Diffstat (limited to 'include/linux/memory_hotplug.h')
| -rw-r--r-- | include/linux/memory_hotplug.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h index 9fcbf5706595..013c69753c91 100644 --- a/include/linux/memory_hotplug.h +++ b/include/linux/memory_hotplug.h @@ -326,9 +326,6 @@ static inline int remove_memory(u64 start, u64 size) static inline void __remove_memory(u64 start, u64 size) {} #endif /* CONFIG_MEMORY_HOTREMOVE */ -extern void set_zone_contiguous(struct zone *zone); -extern void clear_zone_contiguous(struct zone *zone); - #ifdef CONFIG_MEMORY_HOTPLUG extern void __ref free_area_init_core_hotplug(struct pglist_data *pgdat); extern int __add_memory(int nid, u64 start, u64 size, mhp_t mhp_flags); @@ -347,9 +344,8 @@ extern void remove_pfn_range_from_zone(struct zone *zone, extern int sparse_add_section(int nid, unsigned long pfn, unsigned long nr_pages, struct vmem_altmap *altmap, struct dev_pagemap *pgmap); -extern void sparse_remove_section(struct mem_section *ms, - unsigned long pfn, unsigned long nr_pages, - unsigned long map_offset, struct vmem_altmap *altmap); +extern void sparse_remove_section(unsigned long pfn, unsigned long nr_pages, + struct vmem_altmap *altmap); extern struct page *sparse_decode_mem_map(unsigned long coded_mem_map, unsigned long pnum); extern struct zone *zone_for_pfn_range(int online_type, int nid, |