---

yaml --- r: 232011 b: refs/heads/master c: abb6527 h: refs/heads/master i: 232009: 9398a04 232007: d096969 v: v3
git-mirror · Jan 21, 2011 · 4650d39 · 4650d39
1 parent 65a0bc3
commit 4650d39
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 453c719261c0b4030b2676124adb6e81c5fb6833
+refs/heads/master: abb65272a190660790096628859e752172d822fd
diff --git a/trunk/mm/memblock.c b/trunk/mm/memblock.c
@@ -683,13 +683,13 @@ int __init_memblock memblock_is_memory(phys_addr_t addr)
 
 int __init_memblock memblock_is_region_memory(phys_addr_t base, phys_addr_t size)
 {
-	int idx = memblock_search(&memblock.reserved, base);
+	int idx = memblock_search(&memblock.memory, base);
 
 	if (idx == -1)
 		return 0;
-	return memblock.reserved.regions[idx].base <= base &&
-		(memblock.reserved.regions[idx].base +
-		 memblock.reserved.regions[idx].size) >= (base + size);
+	return memblock.memory.regions[idx].base <= base &&
+		(memblock.memory.regions[idx].base +
+		 memblock.memory.regions[idx].size) >= (base + size);
 }
 
 int __init_memblock memblock_is_region_reserved(phys_addr_t base, phys_addr_t size)