* linux-next: rr tree build failure
@ 2009-06-15 6:40 Stephen Rothwell
2009-06-15 7:26 ` Stephen Rothwell
2009-06-15 10:39 ` linux-next: rr tree build failure Rusty Russell
0 siblings, 2 replies; 6+ messages in thread
From: Stephen Rothwell @ 2009-06-15 6:40 UTC (permalink / raw)
To: Rusty Russell; +Cc: linux-next, linux-kernel, David S. Miller
[-- Attachment #1: Type: text/plain, Size: 1249 bytes --]
Hi Rusty,
Today's linux-next build (sparc64 defconfig) failed like this:
arch/sparc/mm/init_64.c: In function 'paging_init':
arch/sparc/mm/init_64.c:1802: error: 'CPU_MASK_ALL_PTR' undeclared (first use in this function)
arch/sparc/kernel/smp_64.c: In function 'setup_per_cpu_areas':
arch/sparc/kernel/smp_64.c:1541: error: 'CPU_MASK_ALL_PTR' undeclared (first use in this function)
Caused by commit 3360ebad15b16eac7b0205595d6fe561716725c5
("cpumask:remove-CPU_MASK_ALL_PTR") from the rr tree interacting with
commits 21bc149d59288fe43d1ba18a59d874ba6a5f1db9 ("sparc64: Make
mdesc_fill_in_cpu_data take a cpumask_t pointer") and
63750a3dc53a87a1f5ca42101ea88578b934ab52 ("sparc64: Defer cpu_data()
setup until end of per-cpu data initialization") from the sparc tree.
Rusty, I assume that there is something that Dave can use in the sparc
tree already instead of CPU_MASK_ALL_PTR (cpu_all_mask?).
I have reverted the rr tree patch for today - after reverting these other
patches as well:
cpumask:move-obsolete-functions-to-end-of-header
cpumask:remove-unused-deprecated-functions
cpumask:remove-cpu_mask_all
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: linux-next: rr tree build failure
2009-06-15 6:40 linux-next: rr tree build failure Stephen Rothwell
@ 2009-06-15 7:26 ` Stephen Rothwell
2009-06-15 8:52 ` David Miller
2009-06-15 10:39 ` linux-next: rr tree build failure Rusty Russell
1 sibling, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2009-06-15 7:26 UTC (permalink / raw)
To: Rusty Russell; +Cc: linux-next, linux-kernel, David S. Miller
[-- Attachment #1: Type: text/plain, Size: 1318 bytes --]
Hi Rusty, Dave,
On Mon, 15 Jun 2009 16:40:22 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next build (sparc64 defconfig) failed like this:
>
> arch/sparc/mm/init_64.c: In function 'paging_init':
> arch/sparc/mm/init_64.c:1802: error: 'CPU_MASK_ALL_PTR' undeclared (first use in this function)
> arch/sparc/kernel/smp_64.c: In function 'setup_per_cpu_areas':
> arch/sparc/kernel/smp_64.c:1541: error: 'CPU_MASK_ALL_PTR' undeclared (first use in this function)
>
> Caused by commit 3360ebad15b16eac7b0205595d6fe561716725c5
> ("cpumask:remove-CPU_MASK_ALL_PTR") from the rr tree interacting with
> commits 21bc149d59288fe43d1ba18a59d874ba6a5f1db9 ("sparc64: Make
> mdesc_fill_in_cpu_data take a cpumask_t pointer") and
> 63750a3dc53a87a1f5ca42101ea88578b934ab52 ("sparc64: Defer cpu_data()
> setup until end of per-cpu data initialization") from the sparc tree.
>
> Rusty, I assume that there is something that Dave can use in the sparc
> tree already instead of CPU_MASK_ALL_PTR (cpu_all_mask?).
OK, senility is definitely setting in! :-) This is the same failure we
had on Friday for which I sent a patch ... Dave, can you apply that to
the sparc tree?
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: linux-next: rr tree build failure
2009-06-15 7:26 ` Stephen Rothwell
@ 2009-06-15 8:52 ` David Miller
2009-06-15 9:44 ` [PATCH] sparc: replace uses of CPU_MASK_ALL_PTR Stephen Rothwell
0 siblings, 1 reply; 6+ messages in thread
From: David Miller @ 2009-06-15 8:52 UTC (permalink / raw)
To: sfr; +Cc: rusty, linux-next, linux-kernel
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Mon, 15 Jun 2009 17:26:40 +1000
> OK, senility is definitely setting in! :-) This is the same failure we
> had on Friday for which I sent a patch ... Dave, can you apply that to
> the sparc tree?
Sorry, slipped through the cracks. Could you please send me
a fresh copy of that patch?
Thanks!
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] sparc: replace uses of CPU_MASK_ALL_PTR
2009-06-15 8:52 ` David Miller
@ 2009-06-15 9:44 ` Stephen Rothwell
2009-06-15 10:06 ` David Miller
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2009-06-15 9:44 UTC (permalink / raw)
To: David Miller; +Cc: rusty, linux-next, linux-kernel
CPU_MASK_ALL is the (deprecated) "all bits set" cpumask, defined as so:
#define CPU_MASK_ALL (cpumask_t) { { ... } }
Taking the address of such a temporary is questionable at best,
unfortunately 321a8e9d (cpumask: add CPU_MASK_ALL_PTR macro) added
CPU_MASK_ALL_PTR:
#define CPU_MASK_ALL_PTR (&CPU_MASK_ALL)
Which formalizes this practice. One day gcc could bite us over this
usage (though we seem to have gotten away with it so far).
[Description by Rusty Russell]
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
arch/sparc/kernel/smp_64.c | 2 +-
arch/sparc/mm/init_64.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/sparc/kernel/smp_64.c b/arch/sparc/kernel/smp_64.c
index 1de47d2..f3a83b0 100644
--- a/arch/sparc/kernel/smp_64.c
+++ b/arch/sparc/kernel/smp_64.c
@@ -1538,5 +1538,5 @@ void __init setup_per_cpu_areas(void)
of_fill_in_cpu_data();
if (tlb_type == hypervisor)
- mdesc_fill_in_cpu_data(CPU_MASK_ALL_PTR);
+ mdesc_fill_in_cpu_data(cpu_all_mask);
}
diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
index b5a5932..ca92e2f 100644
--- a/arch/sparc/mm/init_64.c
+++ b/arch/sparc/mm/init_64.c
@@ -1799,7 +1799,7 @@ void __init paging_init(void)
if (tlb_type == hypervisor) {
sun4v_mdesc_init();
- mdesc_populate_present_mask(CPU_MASK_ALL_PTR);
+ mdesc_populate_present_mask(cpu_all_mask);
}
/* Once the OF device tree and MDESC have been setup, we know
--
1.6.3.1
On Mon, 15 Jun 2009 01:52:01 -0700 (PDT) David Miller <davem@davemloft•net> wrote:
>
> Sorry, slipped through the cracks. Could you please send me
> a fresh copy of that patch?
See above.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: linux-next: rr tree build failure
2009-06-15 6:40 linux-next: rr tree build failure Stephen Rothwell
2009-06-15 7:26 ` Stephen Rothwell
@ 2009-06-15 10:39 ` Rusty Russell
1 sibling, 0 replies; 6+ messages in thread
From: Rusty Russell @ 2009-06-15 10:39 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, David S. Miller
On Mon, 15 Jun 2009 04:10:22 pm Stephen Rothwell wrote:
> Hi Rusty,
>
> Today's linux-next build (sparc64 defconfig) failed like this:
>
> arch/sparc/mm/init_64.c: In function 'paging_init':
> arch/sparc/mm/init_64.c:1802: error: 'CPU_MASK_ALL_PTR' undeclared (first
> use in this function) arch/sparc/kernel/smp_64.c: In function
> 'setup_per_cpu_areas':
> arch/sparc/kernel/smp_64.c:1541: error: 'CPU_MASK_ALL_PTR' undeclared
> (first use in this function)
>
...
> Rusty, I assume that there is something that Dave can use in the sparc
> tree already instead of CPU_MASK_ALL_PTR (cpu_all_mask?).
cpu_all_mask, yes.
I have this great patch someone sent me :)
Thanks,
Rusty.
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Fri, 12 Jun 2009 18:43:54 +1000
Subject: [PATCH] sparc: replace uses of CPU_MASK_ALL_PTR
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
arch/sparc/kernel/smp_64.c | 2 +-
arch/sparc/mm/init_64.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/sparc/kernel/smp_64.c b/arch/sparc/kernel/smp_64.c
index 1de47d2..f3a83b0 100644
--- a/arch/sparc/kernel/smp_64.c
+++ b/arch/sparc/kernel/smp_64.c
@@ -1538,5 +1538,5 @@ void __init setup_per_cpu_areas(void)
of_fill_in_cpu_data();
if (tlb_type == hypervisor)
- mdesc_fill_in_cpu_data(CPU_MASK_ALL_PTR);
+ mdesc_fill_in_cpu_data(cpu_all_mask);
}
diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
index b5a5932..ca92e2f 100644
--- a/arch/sparc/mm/init_64.c
+++ b/arch/sparc/mm/init_64.c
@@ -1799,7 +1799,7 @@ void __init paging_init(void)
if (tlb_type == hypervisor) {
sun4v_mdesc_init();
- mdesc_populate_present_mask(CPU_MASK_ALL_PTR);
+ mdesc_populate_present_mask(cpu_all_mask);
}
/* Once the OF device tree and MDESC have been setup, we know
--
1.6.3.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2009-06-15 10:39 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-06-15 6:40 linux-next: rr tree build failure Stephen Rothwell
2009-06-15 7:26 ` Stephen Rothwell
2009-06-15 8:52 ` David Miller
2009-06-15 9:44 ` [PATCH] sparc: replace uses of CPU_MASK_ALL_PTR Stephen Rothwell
2009-06-15 10:06 ` David Miller
2009-06-15 10:39 ` linux-next: rr tree build failure Rusty Russell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox