]> rtime.felk.cvut.cz Git - linux-imx.git/commitdiff
x86/numa: Use __pa_nodebug() instead
authorBorislav Petkov <bp@suse.de>
Sun, 27 Jan 2013 00:18:21 +0000 (01:18 +0100)
committerIngo Molnar <mingo@kernel.org>
Thu, 31 Jan 2013 10:40:55 +0000 (11:40 +0100)
... 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>
arch/x86/mm/numa.c

index 76604eb9e4b07db4fc81a93e7ba79294535d1378..b2313c6739f536caa800787bacbcfc7c3dd20d1f 100644 (file)
@@ -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);