Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/linville...

[mv-sheeva.git] / include / linux / node.h

diff --git a/include/linux/node.h b/include/linux/node.h
index bc001bc225c3748c01b13cedd42fa59de88b49a3..06292dac3eab15ea6f4b82ddc868e7f955889e7e 100644 (file)
--- a/include/linux/node.h
+++ b/include/linux/node.h
@@ -21,12 +21,19 @@
 
 #include <linux/sysdev.h>
 #include <linux/cpumask.h>
+#include <linux/workqueue.h>
 
 struct node {
        struct sys_device       sysdev;
+
+#if defined(CONFIG_MEMORY_HOTPLUG_SPARSE) && defined(CONFIG_HUGETLBFS)
+       struct work_struct      node_work;
+#endif
 };
 
+struct memory_block;
 extern struct node node_devices[];
+typedef  void (*node_registration_func_t)(struct node *);
 
 extern int register_node(struct node *, int, struct node *);
 extern void unregister_node(struct node *node);
@@ -35,6 +42,14 @@ extern 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,
+                                               int nid);
+extern int unregister_mem_sect_under_nodes(struct memory_block *mem_blk);
+
+#ifdef CONFIG_HUGETLBFS
+extern void register_hugetlbfs_with_node(node_registration_func_t doregister,
+                                        node_registration_func_t unregister);
+#endif
 #else
 static inline int register_one_node(int nid)
 {
@@ -52,6 +67,20 @@ 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,
+                                                       int nid)
+{
+       return 0;
+}
+static inline int unregister_mem_sect_under_nodes(struct memory_block *mem_blk)
+{
+       return 0;
+}
+
+static inline void register_hugetlbfs_with_node(node_registration_func_t reg,
+                                               node_registration_func_t unreg)
+{
+}
 #endif
 
 #define to_node(sys_device) container_of(sys_device, struct node, sysdev)