* linux-next: build failure after merge of the final tree (tip tree related)
@ 2010-09-13 14:29 Stephen Rothwell
2010-09-16 6:32 ` Stephen Rothwell
0 siblings, 1 reply; 10+ messages in thread
From: Stephen Rothwell @ 2010-09-13 14:29 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra
Cc: linux-next, linux-kernel, Benjamin Herrenschmidt, Russell King
[-- Attachment #1: Type: text/plain, Size: 1201 bytes --]
Hi all,
After merging the final tree, today's linux-next build (arm
assabet_defconfig and serveral other arm configs) failed like this:
arch/arm/mm/init.c: In function 'arm_memory_present':
arch/arm/mm/init.c:260: warning: ISO C90 forbids mixed declarations and code
arch/arm/mm/init.c:338: error: invalid storage class for function 'free_area'
arch/arm/mm/init.c:357: error: invalid storage class for function 'free_memmap'
arch/arm/mm/init.c:386: error: invalid storage class for function 'free_unused_memmap'
arch/arm/mm/init.c:601: error: invalid storage class for function 'keepinitrd_setup'
arch/arm/mm/init.c:606: error: initializer element is not constant
arch/arm/mm/init.c:606: error: (near initialization for '__setup_keepinitrd_setup.setup_func')
arch/arm/mm/init.c:606: error: expected declaration or statement at end of input
arch/arm/mm/init.c:252: warning: unused variable 'i'
Caused by commit 719c1514f2fef5f01fcfa2bba81b7bb079c7c6a1 ("memblock/arm:
Use new accessors") which forgot a closing brace on a new
for_each_memblock() in arm_memory_present().
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: linux-next: build failure after merge of the final tree (tip tree related)
2010-09-13 14:29 linux-next: build failure after merge of the final tree (tip tree related) Stephen Rothwell
@ 2010-09-16 6:32 ` Stephen Rothwell
2010-09-16 6:39 ` Ingo Molnar
0 siblings, 1 reply; 10+ messages in thread
From: Stephen Rothwell @ 2010-09-16 6:32 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra
Cc: linux-next, linux-kernel, Benjamin Herrenschmidt, Russell King
[-- Attachment #1: Type: text/plain, Size: 1394 bytes --]
Hi all,
On Tue, 14 Sep 2010 00:29:32 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the final tree, today's linux-next build (arm
> assabet_defconfig and serveral other arm configs) failed like this:
>
> arch/arm/mm/init.c: In function 'arm_memory_present':
> arch/arm/mm/init.c:260: warning: ISO C90 forbids mixed declarations and code
> arch/arm/mm/init.c:338: error: invalid storage class for function 'free_area'
> arch/arm/mm/init.c:357: error: invalid storage class for function 'free_memmap'
> arch/arm/mm/init.c:386: error: invalid storage class for function 'free_unused_memmap'
> arch/arm/mm/init.c:601: error: invalid storage class for function 'keepinitrd_setup'
> arch/arm/mm/init.c:606: error: initializer element is not constant
> arch/arm/mm/init.c:606: error: (near initialization for '__setup_keepinitrd_setup.setup_func')
> arch/arm/mm/init.c:606: error: expected declaration or statement at end of input
> arch/arm/mm/init.c:252: warning: unused variable 'i'
>
> Caused by commit 719c1514f2fef5f01fcfa2bba81b7bb079c7c6a1 ("memblock/arm:
> Use new accessors") which forgot a closing brace on a new
> for_each_memblock() in arm_memory_present().
So this commit is back in tip and the error is back in the builds ...
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: linux-next: build failure after merge of the final tree (tip tree related)
2010-09-16 6:32 ` Stephen Rothwell
@ 2010-09-16 6:39 ` Ingo Molnar
2010-09-16 7:08 ` Russell King - ARM Linux
2010-09-16 7:09 ` Stephen Rothwell
0 siblings, 2 replies; 10+ messages in thread
From: Ingo Molnar @ 2010-09-16 6:39 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Thomas Gleixner, H. Peter Anvin, Peter Zijlstra, linux-next,
linux-kernel, Benjamin Herrenschmidt, Russell King, Yinghai Lu
* Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> On Tue, 14 Sep 2010 00:29:32 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > After merging the final tree, today's linux-next build (arm
> > assabet_defconfig and serveral other arm configs) failed like this:
> >
> > arch/arm/mm/init.c: In function 'arm_memory_present':
> > arch/arm/mm/init.c:260: warning: ISO C90 forbids mixed declarations and code
> > arch/arm/mm/init.c:338: error: invalid storage class for function 'free_area'
> > arch/arm/mm/init.c:357: error: invalid storage class for function 'free_memmap'
> > arch/arm/mm/init.c:386: error: invalid storage class for function 'free_unused_memmap'
> > arch/arm/mm/init.c:601: error: invalid storage class for function 'keepinitrd_setup'
> > arch/arm/mm/init.c:606: error: initializer element is not constant
> > arch/arm/mm/init.c:606: error: (near initialization for '__setup_keepinitrd_setup.setup_func')
> > arch/arm/mm/init.c:606: error: expected declaration or statement at end of input
> > arch/arm/mm/init.c:252: warning: unused variable 'i'
> >
> > Caused by commit 719c1514f2fef5f01fcfa2bba81b7bb079c7c6a1 ("memblock/arm:
> > Use new accessors") which forgot a closing brace on a new
> > for_each_memblock() in arm_memory_present().
>
> So this commit is back in tip and the error is back in the builds ...
The ARM defconfig build doesnt fail here:
WARNING: modpost: Found 5 section mismatch(es).
To see full details build your kernel with:
'make CONFIG_DEBUG_SECTION_MISMATCH=y'
Is there some integration artifact here perhaps? If yes then linux-next
needs to resolve the integration artifact. If not then benh, Yinghai,
hpa, please have a look ...
Thanks,
Ingo
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: linux-next: build failure after merge of the final tree (tip tree related)
2010-09-16 6:39 ` Ingo Molnar
@ 2010-09-16 7:08 ` Russell King - ARM Linux
2010-09-16 7:34 ` Ingo Molnar
2010-09-16 7:09 ` Stephen Rothwell
1 sibling, 1 reply; 10+ messages in thread
From: Russell King - ARM Linux @ 2010-09-16 7:08 UTC (permalink / raw)
To: Ingo Molnar
Cc: Stephen Rothwell, Thomas Gleixner, H. Peter Anvin,
Peter Zijlstra, linux-next, linux-kernel, Benjamin Herrenschmidt,
Yinghai Lu
On Thu, Sep 16, 2010 at 08:39:22AM +0200, Ingo Molnar wrote:
>
> * Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> > Hi all,
> >
> > On Tue, 14 Sep 2010 00:29:32 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > >
> > > After merging the final tree, today's linux-next build (arm
> > > assabet_defconfig and serveral other arm configs) failed like this:
> > >
> > > arch/arm/mm/init.c: In function 'arm_memory_present':
> > > arch/arm/mm/init.c:260: warning: ISO C90 forbids mixed declarations and code
> > > arch/arm/mm/init.c:338: error: invalid storage class for function 'free_area'
> > > arch/arm/mm/init.c:357: error: invalid storage class for function 'free_memmap'
> > > arch/arm/mm/init.c:386: error: invalid storage class for function 'free_unused_memmap'
> > > arch/arm/mm/init.c:601: error: invalid storage class for function 'keepinitrd_setup'
> > > arch/arm/mm/init.c:606: error: initializer element is not constant
> > > arch/arm/mm/init.c:606: error: (near initialization for '__setup_keepinitrd_setup.setup_func')
> > > arch/arm/mm/init.c:606: error: expected declaration or statement at end of input
> > > arch/arm/mm/init.c:252: warning: unused variable 'i'
> > >
> > > Caused by commit 719c1514f2fef5f01fcfa2bba81b7bb079c7c6a1 ("memblock/arm:
> > > Use new accessors") which forgot a closing brace on a new
> > > for_each_memblock() in arm_memory_present().
> >
> > So this commit is back in tip and the error is back in the builds ...
>
> The ARM defconfig build doesnt fail here:
>
> WARNING: modpost: Found 5 section mismatch(es).
> To see full details build your kernel with:
> 'make CONFIG_DEBUG_SECTION_MISMATCH=y'
It probably passes because that configuration doesn't result in the
failing code being built (maybe the failing code is only used for
sparsemem ?)
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: linux-next: build failure after merge of the final tree (tip tree related)
2010-09-16 6:39 ` Ingo Molnar
2010-09-16 7:08 ` Russell King - ARM Linux
@ 2010-09-16 7:09 ` Stephen Rothwell
2010-09-16 7:20 ` Yinghai Lu
1 sibling, 1 reply; 10+ messages in thread
From: Stephen Rothwell @ 2010-09-16 7:09 UTC (permalink / raw)
To: Ingo Molnar
Cc: Thomas Gleixner, H. Peter Anvin, Peter Zijlstra, linux-next,
linux-kernel, Benjamin Herrenschmidt, Russell King, Yinghai Lu
[-- Attachment #1: Type: text/plain, Size: 2213 bytes --]
Hi Ingo,
On Thu, 16 Sep 2010 08:39:22 +0200 Ingo Molnar <mingo@elte.hu> wrote:
>
> * Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> > On Tue, 14 Sep 2010 00:29:32 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > >
> > > After merging the final tree, today's linux-next build (arm
> > > assabet_defconfig and serveral other arm configs) failed like this:
> > >
> > > arch/arm/mm/init.c: In function 'arm_memory_present':
> > > arch/arm/mm/init.c:260: warning: ISO C90 forbids mixed declarations and code
> > > arch/arm/mm/init.c:338: error: invalid storage class for function 'free_area'
> > > arch/arm/mm/init.c:357: error: invalid storage class for function 'free_memmap'
> > > arch/arm/mm/init.c:386: error: invalid storage class for function 'free_unused_memmap'
> > > arch/arm/mm/init.c:601: error: invalid storage class for function 'keepinitrd_setup'
> > > arch/arm/mm/init.c:606: error: initializer element is not constant
> > > arch/arm/mm/init.c:606: error: (near initialization for '__setup_keepinitrd_setup.setup_func')
> > > arch/arm/mm/init.c:606: error: expected declaration or statement at end of input
> > > arch/arm/mm/init.c:252: warning: unused variable 'i'
> > >
> > > Caused by commit 719c1514f2fef5f01fcfa2bba81b7bb079c7c6a1 ("memblock/arm:
> > > Use new accessors") which forgot a closing brace on a new
> > > for_each_memblock() in arm_memory_present().
> >
> > So this commit is back in tip and the error is back in the builds ...
>
> The ARM defconfig build doesnt fail here:
>
> WARNING: modpost: Found 5 section mismatch(es).
> To see full details build your kernel with:
> 'make CONFIG_DEBUG_SECTION_MISMATCH=y'
This is not a "defconfig" build, it is just some of the other arm
"_defconfig" builds (like the one I specified above - assabet_defconfig).
> Is there some integration artifact here perhaps? If yes then linux-next
> needs to resolve the integration artifact. If not then benh, Yinghai,
> hpa, please have a look ...
It is clear from the patch that a closing brace was missed (see above) ...
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: linux-next: build failure after merge of the final tree (tip tree related)
2010-09-16 7:09 ` Stephen Rothwell
@ 2010-09-16 7:20 ` Yinghai Lu
2010-09-16 7:27 ` Stephen Rothwell
2010-09-16 14:43 ` [tip:core/memblock] arm, memblock: Fix the sparsemem build tip-bot for Yinghai Lu
0 siblings, 2 replies; 10+ messages in thread
From: Yinghai Lu @ 2010-09-16 7:20 UTC (permalink / raw)
To: Stephen Rothwell, Ingo Molnar
Cc: Thomas Gleixner, H. Peter Anvin, Peter Zijlstra, linux-next,
linux-kernel, Benjamin Herrenschmidt, Russell King
From: Stephen Rothwell <sfr@canb.auug.org.au>
[PATCH] arm,memblock: Fix compiling with sparsemem
Stephen Rothwell found:
> > > arch/arm/mm/init.c: In function 'arm_memory_present':
> > > arch/arm/mm/init.c:260: warning: ISO C90 forbids mixed declarations and code
> > > arch/arm/mm/init.c:338: error: invalid storage class for function 'free_area'
> > > arch/arm/mm/init.c:357: error: invalid storage class for function 'free_memmap'
> > > arch/arm/mm/init.c:386: error: invalid storage class for function 'free_unused_memmap'
> > > arch/arm/mm/init.c:601: error: invalid storage class for function 'keepinitrd_setup'
> > > arch/arm/mm/init.c:606: error: initializer element is not constant
> > > arch/arm/mm/init.c:606: error: (near initialization for '__setup_keepinitrd_setup.setup_func')
> > > arch/arm/mm/init.c:606: error: expected declaration or statement at end of input
> > > arch/arm/mm/init.c:252: warning: unused variable 'i'
> > >
> > > Caused by commit 719c1514f2fef5f01fcfa2bba81b7bb079c7c6a1 ("memblock/arm:
> > > Use new accessors") which forgot a closing brace on a new
> > > for_each_memblock() in arm_memory_present().
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
---
arch/arm/mm/init.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
Index: linux-2.6/arch/arm/mm/init.c
===================================================================
--- linux-2.6.orig/arch/arm/mm/init.c
+++ linux-2.6/arch/arm/mm/init.c
@@ -249,9 +249,8 @@ static void arm_memory_present(void)
static void arm_memory_present(void)
{
struct memblock_region *reg;
- int i;
- for_each_memblock(memory, reg) {
+ for_each_memblock(memory, reg)
memory_present(0, memblock_region_base_pfn(reg),
memblock_region_end_pfn(reg));
}
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: linux-next: build failure after merge of the final tree (tip tree related)
2010-09-16 7:20 ` Yinghai Lu
@ 2010-09-16 7:27 ` Stephen Rothwell
2010-09-16 14:43 ` [tip:core/memblock] arm, memblock: Fix the sparsemem build tip-bot for Yinghai Lu
1 sibling, 0 replies; 10+ messages in thread
From: Stephen Rothwell @ 2010-09-16 7:27 UTC (permalink / raw)
To: Yinghai Lu
Cc: Ingo Molnar, Thomas Gleixner, H. Peter Anvin, Peter Zijlstra,
linux-next, linux-kernel, Benjamin Herrenschmidt, Russell King
[-- Attachment #1: Type: text/plain, Size: 680 bytes --]
Hi Yinghai,
On Thu, 16 Sep 2010 00:20:36 -0700 Yinghai Lu <yinghai@kernel.org> wrote:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
I did not write this patch ...
> @@ -249,9 +249,8 @@ static void arm_memory_present(void)
> static void arm_memory_present(void)
> {
> struct memblock_region *reg;
> - int i;
>
> - for_each_memblock(memory, reg) {
> + for_each_memblock(memory, reg)
> memory_present(0, memblock_region_base_pfn(reg),
> memblock_region_end_pfn(reg));
> }
That looks good (but I have not tested it). Thanks
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: linux-next: build failure after merge of the final tree (tip tree related)
2010-09-16 7:08 ` Russell King - ARM Linux
@ 2010-09-16 7:34 ` Ingo Molnar
2010-09-16 9:02 ` Russell King - ARM Linux
0 siblings, 1 reply; 10+ messages in thread
From: Ingo Molnar @ 2010-09-16 7:34 UTC (permalink / raw)
To: Russell King - ARM Linux
Cc: Stephen Rothwell, Thomas Gleixner, H. Peter Anvin,
Peter Zijlstra, linux-next, linux-kernel, Benjamin Herrenschmidt,
Yinghai Lu
* Russell King - ARM Linux <linux@arm.linux.org.uk> wrote:
> On Thu, Sep 16, 2010 at 08:39:22AM +0200, Ingo Molnar wrote:
> >
> > * Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > > Hi all,
> > >
> > > On Tue, 14 Sep 2010 00:29:32 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > > >
> > > > After merging the final tree, today's linux-next build (arm
> > > > assabet_defconfig and serveral other arm configs) failed like this:
> > > >
> > > > arch/arm/mm/init.c: In function 'arm_memory_present':
> > > > arch/arm/mm/init.c:260: warning: ISO C90 forbids mixed declarations and code
> > > > arch/arm/mm/init.c:338: error: invalid storage class for function 'free_area'
> > > > arch/arm/mm/init.c:357: error: invalid storage class for function 'free_memmap'
> > > > arch/arm/mm/init.c:386: error: invalid storage class for function 'free_unused_memmap'
> > > > arch/arm/mm/init.c:601: error: invalid storage class for function 'keepinitrd_setup'
> > > > arch/arm/mm/init.c:606: error: initializer element is not constant
> > > > arch/arm/mm/init.c:606: error: (near initialization for '__setup_keepinitrd_setup.setup_func')
> > > > arch/arm/mm/init.c:606: error: expected declaration or statement at end of input
> > > > arch/arm/mm/init.c:252: warning: unused variable 'i'
> > > >
> > > > Caused by commit 719c1514f2fef5f01fcfa2bba81b7bb079c7c6a1 ("memblock/arm:
> > > > Use new accessors") which forgot a closing brace on a new
> > > > for_each_memblock() in arm_memory_present().
> > >
> > > So this commit is back in tip and the error is back in the builds ...
> >
> > The ARM defconfig build doesnt fail here:
> >
> > WARNING: modpost: Found 5 section mismatch(es).
> > To see full details build your kernel with:
> > 'make CONFIG_DEBUG_SECTION_MISMATCH=y'
>
> It probably passes because that configuration doesn't result in the
> failing code being built (maybe the failing code is only used for
> sparsemem ?)
Yeah. If sparsemem is important then it would be helpful if you could
enable it in the ARM defconfig if possible - that's what most people
build.
Thanks,
Ingo
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: linux-next: build failure after merge of the final tree (tip tree related)
2010-09-16 7:34 ` Ingo Molnar
@ 2010-09-16 9:02 ` Russell King - ARM Linux
0 siblings, 0 replies; 10+ messages in thread
From: Russell King - ARM Linux @ 2010-09-16 9:02 UTC (permalink / raw)
To: Ingo Molnar
Cc: Stephen Rothwell, Thomas Gleixner, H. Peter Anvin,
Peter Zijlstra, linux-next, linux-kernel, Benjamin Herrenschmidt,
Yinghai Lu
On Thu, Sep 16, 2010 at 09:34:33AM +0200, Ingo Molnar wrote:
>
> * Russell King - ARM Linux <linux@arm.linux.org.uk> wrote:
>
> > On Thu, Sep 16, 2010 at 08:39:22AM +0200, Ingo Molnar wrote:
> > >
> > > * Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > >
> > > > Hi all,
> > > >
> > > > On Tue, 14 Sep 2010 00:29:32 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > > > >
> > > > > After merging the final tree, today's linux-next build (arm
> > > > > assabet_defconfig and serveral other arm configs) failed like this:
> > > > >
> > > > > arch/arm/mm/init.c: In function 'arm_memory_present':
> > > > > arch/arm/mm/init.c:260: warning: ISO C90 forbids mixed declarations and code
> > > > > arch/arm/mm/init.c:338: error: invalid storage class for function 'free_area'
> > > > > arch/arm/mm/init.c:357: error: invalid storage class for function 'free_memmap'
> > > > > arch/arm/mm/init.c:386: error: invalid storage class for function 'free_unused_memmap'
> > > > > arch/arm/mm/init.c:601: error: invalid storage class for function 'keepinitrd_setup'
> > > > > arch/arm/mm/init.c:606: error: initializer element is not constant
> > > > > arch/arm/mm/init.c:606: error: (near initialization for '__setup_keepinitrd_setup.setup_func')
> > > > > arch/arm/mm/init.c:606: error: expected declaration or statement at end of input
> > > > > arch/arm/mm/init.c:252: warning: unused variable 'i'
> > > > >
> > > > > Caused by commit 719c1514f2fef5f01fcfa2bba81b7bb079c7c6a1 ("memblock/arm:
> > > > > Use new accessors") which forgot a closing brace on a new
> > > > > for_each_memblock() in arm_memory_present().
> > > >
> > > > So this commit is back in tip and the error is back in the builds ...
> > >
> > > The ARM defconfig build doesnt fail here:
> > >
> > > WARNING: modpost: Found 5 section mismatch(es).
> > > To see full details build your kernel with:
> > > 'make CONFIG_DEBUG_SECTION_MISMATCH=y'
> >
> > It probably passes because that configuration doesn't result in the
> > failing code being built (maybe the failing code is only used for
> > sparsemem ?)
>
> Yeah. If sparsemem is important then it would be helpful if you could
> enable it in the ARM defconfig if possible - that's what most people
> build.
But then so is flatmem too - and it's the same story for lots of other
combinations. If we had sparsemem enabled then a similar bug could
have crept into the !SPARSEMEM code just a few lines above.
There's no correct answer here - the only answer is technologies such
as linux-next and kautobuild to build a range of configs to get the
build coverage.
^ permalink raw reply [flat|nested] 10+ messages in thread
* [tip:core/memblock] arm, memblock: Fix the sparsemem build
2010-09-16 7:20 ` Yinghai Lu
2010-09-16 7:27 ` Stephen Rothwell
@ 2010-09-16 14:43 ` tip-bot for Yinghai Lu
1 sibling, 0 replies; 10+ messages in thread
From: tip-bot for Yinghai Lu @ 2010-09-16 14:43 UTC (permalink / raw)
To: linux-tip-commits
Cc: linux-kernel, hpa, mingo, yinghai, peterz, benh, linux, tglx, sfr, mingo
Commit-ID: 7c996361ef0d02ef8c1435902c909d14195adcdc
Gitweb: http://git.kernel.org/tip/7c996361ef0d02ef8c1435902c909d14195adcdc
Author: Yinghai Lu <yinghai@kernel.org>
AuthorDate: Thu, 16 Sep 2010 00:20:36 -0700
Committer: Ingo Molnar <mingo@elte.hu>
CommitDate: Thu, 16 Sep 2010 09:35:12 +0200
arm, memblock: Fix the sparsemem build
Stephen Rothwell reported this build failure:
arch/arm/mm/init.c: In function 'arm_memory_present':
arch/arm/mm/init.c:260: warning: ISO C90 forbids mixed declarations and code
Caused by commit 719c1514f2 ("memblock/arm: Use new accessors")
which forgot a closing brace on a new for_each_memblock() in
arm_memory_present().
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Russell King <linux@arm.linux.org.uk>
LKML-Reference: <4C91C544.5050907@kernel.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
arch/arm/mm/init.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index 8504906..d6022d1 100644
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -249,9 +249,8 @@ static void arm_memory_present(void)
static void arm_memory_present(void)
{
struct memblock_region *reg;
- int i;
- for_each_memblock(memory, reg) {
+ for_each_memblock(memory, reg)
memory_present(0, memblock_region_base_pfn(reg),
memblock_region_end_pfn(reg));
}
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2010-09-16 14:44 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-09-13 14:29 linux-next: build failure after merge of the final tree (tip tree related) Stephen Rothwell
2010-09-16 6:32 ` Stephen Rothwell
2010-09-16 6:39 ` Ingo Molnar
2010-09-16 7:08 ` Russell King - ARM Linux
2010-09-16 7:34 ` Ingo Molnar
2010-09-16 9:02 ` Russell King - ARM Linux
2010-09-16 7:09 ` Stephen Rothwell
2010-09-16 7:20 ` Yinghai Lu
2010-09-16 7:27 ` Stephen Rothwell
2010-09-16 14:43 ` [tip:core/memblock] arm, memblock: Fix the sparsemem build tip-bot for Yinghai Lu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome