[PATCH] register_one_node() compile fix
authorKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Sun, 27 Aug 2006 08:23:52 +0000 (01:23 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sun, 27 Aug 2006 18:01:32 +0000 (11:01 -0700)
register_one_node()'s should be defined under CONFIG_NUMA=n.
fixes following bug.

  CC   init/version.o
  LD   init/built-in.o
  LD   .tmp_vmlinux1
  mm/built-in.o: In function `add_memory': undefined reference to `register_one_node'

Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Acked-by: Yasunori Goto <y-goto@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
include/linux/node.h

index 81dcec84cd8f00290037cb29c7f7e0960b51b895..bc001bc225c3748c01b13cedd42fa59de88b49a3 100644 (file)
@@ -30,12 +30,20 @@ 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);
-#ifdef CONFIG_NUMA
 extern int register_cpu_under_node(unsigned int cpu, unsigned int nid);
 extern int unregister_cpu_under_node(unsigned int cpu, unsigned int nid);
 #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;