[tip:core/memblock] arm, memblock: Fix the sparsemem build

From: tip-bot for Yinghai Lu
Date: Thu Sep 16 2010 - 10:44:18 EST


Commit-ID: 7c996361ef0d02ef8c1435902c909d14195adcdc
Gitweb: http://git.kernel.org/tip/7c996361ef0d02ef8c1435902c909d14195adcdc
Author: Yinghai Lu <yinghai@xxxxxxxxxx>
AuthorDate: Thu, 16 Sep 2010 00:20:36 -0700
Committer: Ingo Molnar <mingo@xxxxxxx>
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@xxxxxxxxxxxxxxxx>
Signed-off-by: Yinghai Lu <yinghai@xxxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Cc: Russell King <linux@xxxxxxxxxxxxxxxx>
LKML-Reference: <4C91C544.5050907@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
---
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));
}
--
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/