---

yaml --- r: 356170 b: refs/heads/master c: 1e9209e h: refs/heads/master v: v3
git-mirror · Jan 31, 2013 · c96cb61 · c96cb61
1 parent 6af8d30
commit c96cb61
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5dfd486c4750c9278c63fa96e6e85bdd2fb58e9d
+refs/heads/master: 1e9209edc71b851d81f0316ca03a0e6335c0ef9a
diff --git a/trunk/arch/x86/mm/numa.c b/trunk/arch/x86/mm/numa.c
@@ -219,7 +219,7 @@ static void __init setup_node_data(int nid, u64 start, u64 end)
 	 */
 	nd = alloc_remap(nid, nd_size);
 	if (nd) {
-		nd_pa = __phys_addr_nodebug(nd);
+		nd_pa = __pa_nodebug(nd);
 		remapped = true;
 	} else {
 		nd_pa = memblock_alloc_nid(nd_size, SMP_CACHE_BYTES, nid);