From 28338128fb352f1af1796fad0e8314f7210a8a01 Mon Sep 17 00:00:00 2001
From: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Date: Sun, 27 Aug 2006 01:23:52 -0700
Subject: [PATCH] --- yaml --- r: 33648 b: refs/heads/master c:
 36920e069a87c6fccffbc0ec5e74985d94d3bcc4 h: refs/heads/master v: v3

---
 [refs]                     |  2 +-
 trunk/include/linux/node.h | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c4ae52df581c..409b8d2c5386 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ea817398e68dfa25612229fda7fc74580cf915fb
+refs/heads/master: 36920e069a87c6fccffbc0ec5e74985d94d3bcc4
diff --git a/trunk/include/linux/node.h b/trunk/include/linux/node.h
index 81dcec84cd8f..bc001bc225c3 100644
--- a/trunk/include/linux/node.h
+++ b/trunk/include/linux/node.h
@@ -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;