From 7249cd073ec2b300acb6eb937266aa1b58d6cbeb Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 25 Jul 2008 12:57:41 +0200
Subject: [PATCH] --- yaml --- r: 106117 b: refs/heads/master c:
 e44d1b2998d62a1f2f4d7eb17b56ba396535509f h: refs/heads/master i:   106115:
 756de85f9c61861b7fc9eb7f463183d64dd2b081 v: v3

---
 [refs]             |  2 +-
 trunk/mm/hugetlb.c | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 6032c161aae5..ce6435ae6086 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5047887caf1806f31652210df27fb62a7c43f27d
+refs/heads/master: e44d1b2998d62a1f2f4d7eb17b56ba396535509f
diff --git a/trunk/mm/hugetlb.c b/trunk/mm/hugetlb.c
index 41341c414194..a8bf4ab01f86 100644
--- a/trunk/mm/hugetlb.c
+++ b/trunk/mm/hugetlb.c
@@ -1026,6 +1026,17 @@ static void __init report_hugepages(void)
 	}
 }
 
+static unsigned int cpuset_mems_nr(unsigned int *array)
+{
+	int node;
+	unsigned int nr = 0;
+
+	for_each_node_mask(node, cpuset_current_mems_allowed)
+		nr += array[node];
+
+	return nr;
+}
+
 #ifdef CONFIG_SYSCTL
 #ifdef CONFIG_HIGHMEM
 static void try_to_free_low(struct hstate *h, unsigned long count)
@@ -1375,17 +1386,6 @@ static int __init hugetlb_default_setup(char *s)
 }
 __setup("default_hugepagesz=", hugetlb_default_setup);
 
-static unsigned int cpuset_mems_nr(unsigned int *array)
-{
-	int node;
-	unsigned int nr = 0;
-
-	for_each_node_mask(node, cpuset_current_mems_allowed)
-		nr += array[node];
-
-	return nr;
-}
-
 int hugetlb_sysctl_handler(struct ctl_table *table, int write,
 			   struct file *file, void __user *buffer,
 			   size_t *length, loff_t *ppos)