From 2e5a9d5b372db212a96c7835f6370d57ba1fb801 Mon Sep 17 00:00:00 2001
From: Yinghai Lu <yinghai@kernel.org>
Date: Mon, 2 May 2011 17:24:49 +0200
Subject: [PATCH] --- yaml --- r: 245719 b: refs/heads/master c:
 a56bca80db8903bb557b9ac38da68dc5b98ea672 h: refs/heads/master i:   245717:
 2d0117d6f31dcfedec7495558e2e0b9d9802ccd5   245715:
 f8c63c3cdeb5e5ea9c1964ad6a7a955c385ecd81   245711:
 42c0f5743a5d5d36244473804ed8f85287e20f66 v: v3

---
 [refs]                   | 2 +-
 trunk/arch/x86/mm/numa.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 3b1fe4b9a77e..757213ac8f60 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1b7e03ef7570568d2fb9e6640d7006a0edd728f6
+refs/heads/master: a56bca80db8903bb557b9ac38da68dc5b98ea672
diff --git a/trunk/arch/x86/mm/numa.c b/trunk/arch/x86/mm/numa.c
index ecb5685d7d20..9a0ed312b830 100644
--- a/trunk/arch/x86/mm/numa.c
+++ b/trunk/arch/x86/mm/numa.c
@@ -189,8 +189,8 @@ int __init numa_add_memblk(int nid, u64 start, u64 end)
 	return numa_add_memblk_to(nid, start, end, &numa_meminfo);
 }
 
-/* Initialize bootmem allocator for a node */
-static void __init setup_node_bootmem(int nid, u64 start, u64 end)
+/* Initialize NODE_DATA for a node on the local memory */
+static void __init setup_node_data(int nid, u64 start, u64 end)
 {
 	const u64 nd_low = PFN_PHYS(MAX_DMA_PFN);
 	const u64 nd_high = PFN_PHYS(max_pfn_mapped);
@@ -522,7 +522,7 @@ static int __init numa_register_memblks(struct numa_meminfo *mi)
 		}
 
 		if (start < end)
-			setup_node_bootmem(nid, start, end);
+			setup_node_data(nid, start, end);
 	}
 
 	return 0;