Merge branch 'misc' into release

[linux-2.6-omap-h63xx.git] / include / linux / node.h

diff --git a/include/linux/node.h b/include/linux/node.h
index 254dc3de650b81e5cce4821f8101dad72005f996..681a697b9a8624b0df39c21c9cda475203b91615 100644 (file)
--- a/include/linux/node.h
+++ b/include/linux/node.h
@@ -26,8 +26,46 @@ struct node {
        struct sys_device       sysdev;
 };
 
+struct memory_block;
+extern struct node node_devices[];
+
 extern int register_node(struct node *, int, struct node *);
 extern void unregister_node(struct node *node);
+#ifdef CONFIG_NUMA
+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);
+#else
+static inline int register_one_node(int nid)
+{
+       return 0;
+}
+static inline int unregister_one_node(int nid)
+{
+       return 0;
+}
+static inline int register_cpu_under_node(unsigned int cpu, unsigned int nid)
+{
+       return 0;
+}
+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;
+}
+#endif
 
 #define to_node(sys_device) container_of(sys_device, struct node, sysdev)