---

yaml --- r: 33249 b: refs/heads/master c: 0f04ab5 h: refs/heads/master i: 33247: ab5ba3c v: v3
git-mirror · Aug 6, 2006 · 8fa4f7c · 8fa4f7c
1 parent 2d29780
commit 8fa4f7c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6f712711dbd180aa3777efe5ae3b9b0e915b9471
+refs/heads/master: 0f04ab5efbca73ab366a156d96b073d2da35b158
diff --git a/trunk/kernel/resource.c b/trunk/kernel/resource.c
@@ -261,8 +261,10 @@ int find_next_system_ram(struct resource *res)
 	if (!p)
 		return -1;
 	/* copy data */
-	res->start = p->start;
-	res->end = p->end;
+	if (res->start < p->start)
+		res->start = p->start;
+	if (res->end > p->end)
+		res->end = p->end;
 	return 0;
 }
 #endif