diff options
| author | Marc Zyngier <maz@kernel.org> | 2020-11-12 21:20:43 +0000 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2020-11-12 21:20:43 +0000 |
| commit | 4f6b838c378a52ea3ae0b15f12ca8a20849072fa (patch) | |
| tree | fbd8c2346320f97eda221b9150d787f9006e8b35 /include/linux/node.h | |
| parent | c512298eed0360923d0cbc4a1f30bc0509af0d50 (diff) | |
| parent | 3650b228f83adda7e5ee532e2b90429c03f7b9ec (diff) | |
| download | cachepc-linux-4f6b838c378a52ea3ae0b15f12ca8a20849072fa.tar.gz cachepc-linux-4f6b838c378a52ea3ae0b15f12ca8a20849072fa.zip | |
Merge tag 'v5.10-rc1' into kvmarm-master/next
Linux 5.10-rc1
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'include/linux/node.h')
| -rw-r--r-- | include/linux/node.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/include/linux/node.h b/include/linux/node.h index 4866f32a02d8..8e5a29897936 100644 --- a/include/linux/node.h +++ b/include/linux/node.h @@ -99,13 +99,14 @@ extern struct node *node_devices[]; typedef void (*node_registration_func_t)(struct node *); #if defined(CONFIG_MEMORY_HOTPLUG_SPARSE) && defined(CONFIG_NUMA) -extern int link_mem_sections(int nid, unsigned long start_pfn, - unsigned long end_pfn); +void link_mem_sections(int nid, unsigned long start_pfn, + unsigned long end_pfn, + enum meminit_context context); #else -static inline int link_mem_sections(int nid, unsigned long start_pfn, - unsigned long end_pfn) +static inline void link_mem_sections(int nid, unsigned long start_pfn, + unsigned long end_pfn, + enum meminit_context context) { - return 0; } #endif @@ -128,7 +129,7 @@ static inline int register_one_node(int nid) if (error) return error; /* link memory sections under this node */ - error = link_mem_sections(nid, start_pfn, end_pfn); + link_mem_sections(nid, start_pfn, end_pfn, MEMINIT_EARLY); } return error; |