Commit-ID:  1e9209edc71b851d81f0316ca03a0e6335c0ef9a
Gitweb:     http://git.kernel.org/tip/1e9209edc71b851d81f0316ca03a0e6335c0ef9a
Author:     Borislav Petkov <b...@suse.de>
AuthorDate: Sun, 27 Jan 2013 01:18:21 +0100
Committer:  Ingo Molnar <mi...@kernel.org>
CommitDate: Thu, 31 Jan 2013 11:40:55 +0100

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 <b...@suse.de>
Acked-by: Dave Hansen <d...@linux.vnet.ibm.com>
Link: http://lkml.kernel.org/r/1359245901-8512-1-git-send-email...@alien8.de
Signed-off-by: Ingo Molnar <mi...@kernel.org>
---
 arch/x86/mm/numa.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
index 76604eb..b2313c6 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);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to