From 60fd09f8becb4fa1da4992d1098ff5ea2f08599e Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@osdl.org>
Date: Thu, 19 Oct 2006 23:29:05 -0700
Subject: [PATCH] --- yaml --- r: 40013 b: refs/heads/master c:
 6220ec7844fda2686496013a66b5b9169976b991 h: refs/heads/master i:   40011:
 440312922f8cd6fb07b803e3e174d04e96194521 v: v3

---
 [refs]                |  2 +-
 trunk/lib/cpumask.c   | 16 ----------------
 trunk/mm/page_alloc.c | 16 ++++++++++++++++
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/[refs] b/[refs]
index c2c8a67d7fb4..e2b77f4934f8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e51959faa61278c762389802faf8ba1a40676628
+refs/heads/master: 6220ec7844fda2686496013a66b5b9169976b991
diff --git a/trunk/lib/cpumask.c b/trunk/lib/cpumask.c
index 7a2a73f88d59..3a67dc5ada7d 100644
--- a/trunk/lib/cpumask.c
+++ b/trunk/lib/cpumask.c
@@ -43,19 +43,3 @@ int __any_online_cpu(const cpumask_t *mask)
 	return cpu;
 }
 EXPORT_SYMBOL(__any_online_cpu);
-
-#if MAX_NUMNODES > 1
-/*
- * Find the highest possible node id.
- */
-int highest_possible_node_id(void)
-{
-	unsigned int node;
-	unsigned int highest = 0;
-
-	for_each_node_mask(node, node_possible_map)
-		highest = node;
-	return highest;
-}
-EXPORT_SYMBOL(highest_possible_node_id);
-#endif
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
index afee38f04d84..ebd425c2e2a7 100644
--- a/trunk/mm/page_alloc.c
+++ b/trunk/mm/page_alloc.c
@@ -3120,3 +3120,19 @@ unsigned long page_to_pfn(struct page *page)
 EXPORT_SYMBOL(pfn_to_page);
 EXPORT_SYMBOL(page_to_pfn);
 #endif /* CONFIG_OUT_OF_LINE_PFN_TO_PAGE */
+
+#if MAX_NUMNODES > 1
+/*
+ * Find the highest possible node id.
+ */
+int highest_possible_node_id(void)
+{
+	unsigned int node;
+	unsigned int highest = 0;
+
+	for_each_node_mask(node, node_possible_map)
+		highest = node;
+	return highest;
+}
+EXPORT_SYMBOL(highest_possible_node_id);
+#endif