diff options
| author | Jonathan Corbet <corbet@lwn.net> | 2019-07-22 22:42:10 +0300 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2019-07-22 22:42:10 +0300 |
| commit | e27a24210aa17b8a0cd462865130fe73afd7e001 (patch) | |
| tree | b2d7b8311d280244fad3166792e8f447081a8bc9 /include/linux/node.h | |
| parent | 224d5fd43d250f850d64fb6d668114aff29d7022 (diff) | |
| parent | 5f9e832c137075045d15cd6899ab0505cfb2ca4b (diff) | |
| download | linux-e27a24210aa17b8a0cd462865130fe73afd7e001.tar.xz | |
Merge tag 'v5.3-rc1' into docs-next
Pull in all of the massive docs changes from elsewhere.
Diffstat (limited to 'include/linux/node.h')
| -rw-r--r-- | include/linux/node.h | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/include/linux/node.h b/include/linux/node.h index 1a557c589ecb..4866f32a02d8 100644 --- a/include/linux/node.h +++ b/include/linux/node.h @@ -137,10 +137,7 @@ static inline int register_one_node(int nid) extern void unregister_one_node(int nid); extern int register_cpu_under_node(unsigned int cpu, unsigned int nid); extern int unregister_cpu_under_node(unsigned int cpu, unsigned int nid); -extern int register_mem_sect_under_node(struct memory_block *mem_blk, - void *arg); -extern int unregister_mem_sect_under_nodes(struct memory_block *mem_blk, - unsigned long phys_index); +extern void unregister_memory_block_under_nodes(struct memory_block *mem_blk); extern int register_memory_node_under_compute_node(unsigned int mem_nid, unsigned int cpu_nid, @@ -171,15 +168,8 @@ static inline int unregister_cpu_under_node(unsigned int cpu, unsigned int nid) { return 0; } -static inline int register_mem_sect_under_node(struct memory_block *mem_blk, - void *arg) +static inline void unregister_memory_block_under_nodes(struct memory_block *mem_blk) { - return 0; -} -static inline int unregister_mem_sect_under_nodes(struct memory_block *mem_blk, - unsigned long phys_index) -{ - return 0; } static inline void register_hugetlbfs_with_node(node_registration_func_t reg, |