---

yaml --- r: 212680 b: refs/heads/master c: 5e6f6aa h: refs/heads/master v: v3
git-mirror · Aug 4, 2010 · 4f34957 · 4f34957
1 parent 4a7ff7c
commit 4f34957
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 15 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 72d4b0b4e0e7fa858767e03972771a9f7c02b689
+refs/heads/master: 5e6f6aa1c243fafeb2648cf4ebd5abd99ab2531b
diff --git a/trunk/arch/arm/mm/init.c b/trunk/arch/arm/mm/init.c
@@ -237,20 +237,7 @@ static void __init arm_bootmem_free(struct meminfo *mi, unsigned long min,
 #ifndef CONFIG_SPARSEMEM
 int pfn_valid(unsigned long pfn)
 {
-	struct memblock_type *mem = &memblock.memory;
-	unsigned int left = 0, right = mem->cnt;
-
-	do {
-		unsigned int mid = (right + left) / 2;
-
-		if (pfn < memblock_start_pfn(mem, mid))
-			right = mid;
-		else if (pfn >= memblock_end_pfn(mem, mid))
-			left = mid + 1;
-		else
-			return 1;
-	} while (left < right);
-	return 0;
+	return memblock_is_memory(pfn << PAGE_SHIFT);
 }
 EXPORT_SYMBOL(pfn_valid);