From: Borislav Petkov <bp@alien8.de>
To: "H. Peter Anvin" <hpa@zytor.com>
Cc: LKML <linux-kernel@vger.kernel.org>, Borislav Petkov <bp@suse.de>,
Dave Hansen <dave@linux.vnet.ibm.com>
Subject: [PATCH] x86, numa: Use __pa_nodebug instead
Date: Sun, 27 Jan 2013 01:18:21 +0100 [thread overview]
Message-ID: <1359245901-8512-1-git-send-email-bp@alien8.de> (raw)
From: Borislav Petkov <bp@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 <bp@suse.de>
Cc: Dave Hansen <dave@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
next reply other threads:[~2013-01-27 0:15 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-27 0:18 Borislav Petkov [this message]
2013-01-28 19:16 ` [PATCH] x86, numa: Use __pa_nodebug instead Dave Hansen
2013-01-31 9:49 ` Borislav Petkov
2013-01-31 11:11 ` [tip:x86/mm] x86/numa: Use __pa_nodebug() instead tip-bot for Borislav Petkov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1359245901-8512-1-git-send-email-bp@alien8.de \
--to=bp@alien8.de \
--cc=bp@suse.de \
--cc=dave@linux.vnet.ibm.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox