Re: linux-next: build failure after merge of the final tree (tiptree related)

[Yinghai Lu]

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>

[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@xxxxxxxxxx>

---
 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));
 }
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/