Pull more MM updates from Andrew Morton: "Only two patch series in this pull request: - "mm/memory_hotplug: fixup crash during uevent handling" from Hannes Reinecke fixes a race that was causing udev to trigger a crash in the memory hotplug code - "mm_slot: following fixup for usage of mm_slot_entry()" from Wei Yang adds some touchups to the just-merged mm_slot changes" * tag 'mm-stable-2025-10-03-16-49' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm: mm/khugepaged: use KMEM_CACHE() mm/ksm: cleanup mm_slot_entry() invocation Documentation/mm: drop pxx_mkdevmap() descriptions from page table helpers mm: clean up is_guard_pte_marker() drivers/base: move memory_block_add_nid() into the caller mm/memory_hotplug: activate node before adding new memory blocks drivers/base/memory: add node id parameter to add_memory_block()
Showing the changes to include/linux (1 of 8 files). Show all
Unified · Split
| @@ -159,7 +159,7 @@ static inline unsigned long memory_block_advised_max_size(void) · 158 unmodified lines | |||
| 159 | extern int register_memory_notifier(struct notifier_block *nb); | 159 | extern int register_memory_notifier(struct notifier_block *nb); |
| 160 | extern void unregister_memory_notifier(struct notifier_block *nb); | 160 | extern void unregister_memory_notifier(struct notifier_block *nb); |
| 161 | int create_memory_block_devices(unsigned long start, unsigned long size, | 161 | int create_memory_block_devices(unsigned long start, unsigned long size, |
| 162 | struct vmem_altmap *altmap, | 162 | int nid, struct vmem_altmap *altmap, |
| 163 | struct memory_group *group); | 163 | struct memory_group *group); |
| 164 | void remove_memory_block_devices(unsigned long start, unsigned long size); | 164 | void remove_memory_block_devices(unsigned long start, unsigned long size); |
| 165 | extern void memory_dev_init(void); | 165 | extern void memory_dev_init(void); |
| @@ -202,8 +202,7 @@ static inline unsigned long phys_to_block_id(unsigned long phys) · 36 unmodified lines | |||
| 202 | } | 202 | } |
| 203 | 203 | ||
| 204 | #ifdef CONFIG_NUMA | 204 | #ifdef CONFIG_NUMA |
| 205 | void memory_block_add_nid(struct memory_block *mem, int nid, | 205 | void memory_block_add_nid_early(struct memory_block *mem, int nid); |
| 206 | enum meminit_context context); | ||
| 207 | #endif /* CONFIG_NUMA */ | 206 | #endif /* CONFIG_NUMA */ |
| 208 | int memory_block_advise_max_size(unsigned long size); | 207 | int memory_block_advise_max_size(unsigned long size); |
| 209 | unsigned long memory_block_advised_max_size(void); | 208 | unsigned long memory_block_advised_max_size(void); |