From c96cb611c4259fd4727958c61dbe990937b0707b Mon Sep 17 00:00:00 2001
From: Borislav Petkov <bp@suse.de>
Date: Sun, 27 Jan 2013 01:18:21 +0100
Subject: [PATCH] --- yaml --- r: 356170 b: refs/heads/master c:
 1e9209edc71b851d81f0316ca03a0e6335c0ef9a h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index af8255d38cdc..9fe6422b0a1a 100644
--- 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
index 76604eb9e4b0..b2313c6739f5 100644
--- 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);