From 94bb2949b8dbf58213c71638460d5020a19ef646 Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Thu, 1 Jul 2010 12:03:29 +0100
Subject: [PATCH] --- yaml --- r: 201436 b: refs/heads/master c:
 e07b9e08601b400aee7e076e7b31799d3dd48c1e h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/arch/arm/mm/init.c | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 489d39302325..e0b5735d931f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eda2e5dcc914b4d70f665443efc9780e89a5e5c1
+refs/heads/master: e07b9e08601b400aee7e076e7b31799d3dd48c1e
diff --git a/trunk/arch/arm/mm/init.c b/trunk/arch/arm/mm/init.c
index a453982fdcef..c357bfb464ae 100644
--- a/trunk/arch/arm/mm/init.c
+++ b/trunk/arch/arm/mm/init.c
@@ -239,16 +239,15 @@ static void __init arm_bootmem_free(struct meminfo *mi)
 #ifndef CONFIG_SPARSEMEM
 int pfn_valid(unsigned long pfn)
 {
-	struct meminfo *mi = &meminfo;
-	unsigned int left = 0, right = mi->nr_banks;
+	struct memblock_region *mem = &memblock.memory;
+	unsigned int left = 0, right = mem->cnt;
 
 	do {
 		unsigned int mid = (right + left) / 2;
-		struct membank *bank = &mi->bank[mid];
 
-		if (pfn < bank_pfn_start(bank))
+		if (pfn < memblock_start_pfn(mem, mid))
 			right = mid;
-		else if (pfn >= bank_pfn_end(bank))
+		else if (pfn >= memblock_end_pfn(mem, mid))
 			left = mid + 1;
 		else
 			return 1;