* [PATCH] x86, numa: Use __pa_nodebug instead
@ 2013-01-27 0:18 Borislav Petkov
2013-01-28 19:16 ` Dave Hansen
2013-01-31 11:11 ` [tip:x86/mm] x86/numa: Use __pa_nodebug() instead tip-bot for Borislav Petkov
0 siblings, 2 replies; 4+ messages in thread
From: Borislav Petkov @ 2013-01-27 0:18 UTC (permalink / raw)
To: H. Peter Anvin; +Cc: LKML, Borislav Petkov, Dave Hansen
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
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] x86, numa: Use __pa_nodebug instead
2013-01-27 0:18 [PATCH] x86, numa: Use __pa_nodebug instead Borislav Petkov
@ 2013-01-28 19:16 ` 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
1 sibling, 1 reply; 4+ messages in thread
From: Dave Hansen @ 2013-01-28 19:16 UTC (permalink / raw)
To: Borislav Petkov; +Cc: H. Peter Anvin, LKML, Borislav Petkov
On 01/26/2013 04:18 PM, Borislav Petkov wrote:
> 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>
I was just about to send out a patch for it and came up with the same fix.
Acked-by: Dave Hansen <dave@linux.vnet.ibm.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] x86, numa: Use __pa_nodebug instead
2013-01-28 19:16 ` Dave Hansen
@ 2013-01-31 9:49 ` Borislav Petkov
0 siblings, 0 replies; 4+ messages in thread
From: Borislav Petkov @ 2013-01-31 9:49 UTC (permalink / raw)
To: H. Peter Anvin, Ingo Molnar; +Cc: Dave Hansen, LKML, Borislav Petkov
On Mon, Jan 28, 2013 at 11:16:24AM -0800, Dave Hansen wrote:
> On 01/26/2013 04:18 PM, Borislav Petkov wrote:
> > 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>
>
> I was just about to send out a patch for it and came up with the same fix.
>
> Acked-by: Dave Hansen <dave@linux.vnet.ibm.com>
This still triggers on tip:x86/mm.
--
Regards/Gruss,
Boris.
Sent from a fat crate under my desk. Formatting is fine.
--
^ permalink raw reply [flat|nested] 4+ messages in thread
* [tip:x86/mm] x86/numa: Use __pa_nodebug() instead
2013-01-27 0:18 [PATCH] x86, numa: Use __pa_nodebug instead Borislav Petkov
2013-01-28 19:16 ` Dave Hansen
@ 2013-01-31 11:11 ` tip-bot for Borislav Petkov
1 sibling, 0 replies; 4+ messages in thread
From: tip-bot for Borislav Petkov @ 2013-01-31 11:11 UTC (permalink / raw)
To: linux-tip-commits; +Cc: linux-kernel, hpa, mingo, dave, tglx, bp
Commit-ID: 1e9209edc71b851d81f0316ca03a0e6335c0ef9a
Gitweb: http://git.kernel.org/tip/1e9209edc71b851d81f0316ca03a0e6335c0ef9a
Author: Borislav Petkov <bp@suse.de>
AuthorDate: Sun, 27 Jan 2013 01:18:21 +0100
Committer: Ingo Molnar <mingo@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 <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 | 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);
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-01-31 11:14 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-27 0:18 [PATCH] x86, numa: Use __pa_nodebug instead Borislav Petkov
2013-01-28 19:16 ` 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
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.