Merge tag 's390-5.3-5' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

[linux-2.6-microblaze.git] / include / linux / node.h

diff --git a/include/linux/node.h b/include/linux/node.h
index 1a557c5..4866f32 100644 (file)
--- 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,