diff options
| author | Borislav Petkov <bp@suse.de> | 2020-12-01 18:22:55 +0100 |
|---|---|---|
| committer | Borislav Petkov <bp@suse.de> | 2020-12-01 18:22:55 +0100 |
| commit | 15936ca13dac032a3f4e6b4ba78add3880bddcf3 (patch) | |
| tree | b56c7a5c75b25e5d91a09c9f1875cae4e50198ba /include/linux/memory_hotplug.h | |
| parent | 4a24d80b8c3e9f89d6a6a7b89bd057c463b638d3 (diff) | |
| parent | b65054597872ce3aefbc6a666385eabdf9e288da (diff) | |
Merge tag 'v5.10-rc6' into ras/core
Merge the -rc6 tag to pick up dependent changes.
Signed-off-by: Borislav Petkov <bp@suse.de>
Diffstat (limited to 'include/linux/memory_hotplug.h')
| -rw-r--r-- | include/linux/memory_hotplug.h | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h index d65c6fdc5cfc..551093b74596 100644 --- a/include/linux/memory_hotplug.h +++ b/include/linux/memory_hotplug.h @@ -281,20 +281,6 @@ static inline bool movable_node_is_enabled(void) } #endif /* ! CONFIG_MEMORY_HOTPLUG */ -#ifdef CONFIG_NUMA -extern int memory_add_physaddr_to_nid(u64 start); -extern int phys_to_target_node(u64 start); -#else -static inline int memory_add_physaddr_to_nid(u64 start) -{ - return 0; -} -static inline int phys_to_target_node(u64 start) -{ - return 0; -} -#endif - #if defined(CONFIG_MEMORY_HOTPLUG) || defined(CONFIG_DEFERRED_STRUCT_PAGE_INIT) /* * pgdat resizing functions |