---

yaml --- r: 179350 b: refs/heads/master c: d2dbe08 h: refs/heads/master v: v3
git-mirror · Jan 16, 2010 · d6e641a · d6e641a
1 parent 5583ad7
commit d6e641a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5dab600e6a153ceb64832f608069e6c08185411a
+refs/heads/master: d2dbe08ddceb4ba2b274abb84326d7e69d454e5c
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
@@ -3998,7 +3998,7 @@ void __init add_active_range(unsigned int nid, unsigned long start_pfn,
 		}
 
 		/* Merge backward if suitable */
-		if (start_pfn < early_node_map[i].end_pfn &&
+		if (start_pfn < early_node_map[i].start_pfn &&
 				end_pfn >= early_node_map[i].start_pfn) {
 			early_node_map[i].start_pfn = start_pfn;
 			return;