summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2026-07-03 13:58:44 +0100
committerMark Brown <broonie@kernel.org>2026-07-03 13:58:44 +0100
commit4b1da40067add0086aeeb06fce27c31fd21324a4 (patch)
tree97a031d4f23d7724382069fa080a3eaeeafb7968 /include
parentb330bdab6b8799b8c7239867838d3149cace6d90 (diff)
parent2ebce860bdd7ae5e13002811bc9bbbf33fcfc221 (diff)
downloadlinux-next-4b1da40067add0086aeeb06fce27c31fd21324a4.tar.gz
linux-next-4b1da40067add0086aeeb06fce27c31fd21324a4.zip
Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git
Diffstat (limited to 'include')
-rw-r--r--include/linux/memory_hotplug.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h
index 7c9d66729c60..06c58cb05779 100644
--- a/include/linux/memory_hotplug.h
+++ b/include/linux/memory_hotplug.h
@@ -289,7 +289,7 @@ static inline void __remove_memory(u64 start, u64 size) {}
/* Default online_type (MMOP_*) when new memory blocks are added. */
extern enum mmop mhp_get_default_online_type(void);
extern void mhp_set_default_online_type(enum mmop online_type);
-extern void __ref free_area_init_core_hotplug(struct pglist_data *pgdat);
+int __ref free_area_init_core_hotplug(struct pglist_data *pgdat);
extern int __add_memory(int nid, u64 start, u64 size, mhp_t mhp_flags);
extern int add_memory(int nid, u64 start, u64 size, mhp_t mhp_flags);
extern int add_memory_resource(int nid, struct resource *resource,