diff options
| author | Wolfram Sang <wsa@kernel.org> | 2020-12-07 07:57:42 +0100 |
|---|---|---|
| committer | Wolfram Sang <wsa@kernel.org> | 2020-12-07 07:57:42 +0100 |
| commit | 1e04538c751bfc572bfa9995996c7f4af098a625 (patch) | |
| tree | 40aa603803f857af4a5a5f25f81b6fb31b8e0152 /include/linux/memory_hotplug.h | |
| parent | 5e9a97b1f4491b8b65874901ad084348fcaba327 (diff) | |
| parent | 0477e92881850d44910a7e94fc2c46f96faa131f (diff) | |
Merge branch 'i2c/for-current' into i2c/for-5.11
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 |