From 32c943634e31daa864459e98e65b1410edafd4b0 Mon Sep 17 00:00:00 2001
From: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Date: Sat, 5 Aug 2006 12:15:01 -0700
Subject: [PATCH] --- yaml --- r: 33250 b: refs/heads/master c:
 58c1b5b079071d82b2f924000b7e8fb5585ce7d8 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/kernel/resource.c   | 3 ++-
 trunk/mm/memory_hotplug.c | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 36187fe1cb74..bcd8800f103e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0f04ab5efbca73ab366a156d96b073d2da35b158
+refs/heads/master: 58c1b5b079071d82b2f924000b7e8fb5585ce7d8
diff --git a/trunk/kernel/resource.c b/trunk/kernel/resource.c
index 63e879379dbd..46286434af80 100644
--- a/trunk/kernel/resource.c
+++ b/trunk/kernel/resource.c
@@ -244,6 +244,7 @@ int find_next_system_ram(struct resource *res)
 
 	start = res->start;
 	end = res->end;
+	BUG_ON(start >= end);
 
 	read_lock(&resource_lock);
 	for (p = iomem_resource.child; p ; p = p->sibling) {
@@ -254,7 +255,7 @@ int find_next_system_ram(struct resource *res)
 			p = NULL;
 			break;
 		}
-		if (p->start >= start)
+		if ((p->end >= start) && (p->start < end))
 			break;
 	}
 	read_unlock(&resource_lock);
diff --git a/trunk/mm/memory_hotplug.c b/trunk/mm/memory_hotplug.c
index 7d25cc12235f..26f1840879d6 100644
--- a/trunk/mm/memory_hotplug.c
+++ b/trunk/mm/memory_hotplug.c
@@ -163,7 +163,7 @@ int online_pages(unsigned long pfn, unsigned long nr_pages)
 	res.flags = IORESOURCE_MEM; /* we just need system ram */
 	section_end = res.end;
 
-	while (find_next_system_ram(&res) >= 0) {
+	while ((res.start < res.end) && (find_next_system_ram(&res) >= 0)) {
 		start_pfn = (unsigned long)(res.start >> PAGE_SHIFT);
 		nr_pages = (unsigned long)
                            ((res.end + 1 - res.start) >> PAGE_SHIFT);