From: Borislav Petkov <b...@suse.de>
... 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 [enabled by default]
In file included from
/home/boris/w/kernel/linux-2.6/arch/x86/include/asm/page.h:11:0,
from
/home/boris/w/kernel/linux-2.6/arch/x86/include/asm/thread_info.h:11,
from include/linux/thread_info.h:54,
from include/linux/preempt.h:9,
from include/linux/spinlock.h:50,
from include/linux/mmzone.h:7,
from include/linux/gfp.h:4,
from include/linux/mm.h:8,
from arch/x86/mm/numa.c:3:
/home/boris/w/kernel/linux-2.6/arch/x86/include/asm/page_64.h:12:29: note:
expected ‘long unsigned int’ but argument is of type ‘void *’
Signed-off-by: Borislav Petkov <b...@suse.de>
Cc: Dave Hansen <d...@linux.vnet.ibm.com>
---
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 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);
--
1.8.1.rc3
--
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/
