diff options
author | 2013-01-27 01:18:21 +0100 | |
---|---|---|
committer | 2013-01-31 11:40:55 +0100 | |
commit | 1e9209edc71b851d81f0316ca03a0e6335c0ef9a (patch) | |
tree | 6fab51c75a9adc7f965b724a7039d4f308927252 /arch/x86/mm | |
parent | x86, kvm: Fix kvm's use of __pa() on percpu areas (diff) | |
download | linux-1e9209edc71b851d81f0316ca03a0e6335c0ef9a.tar.gz linux-1e9209edc71b851d81f0316ca03a0e6335c0ef9a.tar.bz2 linux-1e9209edc71b851d81f0316ca03a0e6335c0ef9a.zip |
x86/numa: Use __pa_nodebug() instead
... and fix the following warning:
arch/x86/mm/numa.c: In function ‘setup_node_data’:
arch/x86/mm/numa.c:222:3: warning: passing argument 1 of ‘__phys_addr_nodebug’ makes integer from pointer without a cast
Signed-off-by: Borislav Petkov <bp@suse.de>
Acked-by: Dave Hansen <dave@linux.vnet.ibm.com>
Link: http://lkml.kernel.org/r/1359245901-8512-1-git-send-email-bp@alien8.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/mm')
-rw-r--r-- | arch/x86/mm/numa.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c index 76604eb9e4b0..b2313c6739f5 100644 --- a/arch/x86/mm/numa.c +++ b/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); |