History

Merge tag 'mm-stable-2025-10-03-16-49' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

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()

Linus Torvalds committed 1 year ago

Commit 7a405db2 parents cf0e371 c14bdcc8 files · +63 −79Browse files

Showing the changes to include/linux (1 of 8 files). Show all

Unified · Split

include/linux/memory.h+2−3
@@ -159,7 +159,7 @@ static inline unsigned long memory_block_advised_max_size(void) · 158 unmodified lines
159159 extern int register_memory_notifier(struct notifier_block *nb);
160160 extern void unregister_memory_notifier(struct notifier_block *nb);
161161 int create_memory_block_devices(unsigned long start, unsigned long size,
162− struct vmem_altmap *altmap,
162+ int nid, struct vmem_altmap *altmap,
163163 struct memory_group *group);
164164 void remove_memory_block_devices(unsigned long start, unsigned long size);
165165 extern void memory_dev_init(void);
@@ -202,8 +202,7 @@ static inline unsigned long phys_to_block_id(unsigned long phys) · 36 unmodified lines
202202 }
203203
204204 #ifdef CONFIG_NUMA
205−void memory_block_add_nid(struct memory_block *mem, int nid,
206− enum meminit_context context);
205+void memory_block_add_nid_early(struct memory_block *mem, int nid);
207206 #endif /* CONFIG_NUMA */
208207 int memory_block_advise_max_size(unsigned long size);
209208 unsigned long memory_block_advised_max_size(void);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t