diff options
author | KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> | 2006-08-05 15:15:01 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-08-06 11:57:48 -0400 |
commit | 58c1b5b079071d82b2f924000b7e8fb5585ce7d8 (patch) | |
tree | 74178ceb6462b68cba9f1b144d450dafcaf01c22 /mm/memory_hotplug.c | |
parent | 0f04ab5efbca73ab366a156d96b073d2da35b158 (diff) |
[PATCH] memory hotadd fixes: find_next_system_ram catch range fix
find_next_system_ram() is used to find available memory resource at onlining
newly added memory. This patch fixes following problem.
find_next_system_ram() cannot catch this case.
Resource: (start)-------------(end)
Section : (start)-------------(end)
Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Keith Mannthey <kmannth@gmail.com>
Cc: Yasunori Goto <y-goto@jp.fujitsu.com>
Cc: Dave Hansen <haveblue@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'mm/memory_hotplug.c')
-rw-r--r-- | mm/memory_hotplug.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 7d25cc12235f..26f1840879d6 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c | |||
@@ -163,7 +163,7 @@ int online_pages(unsigned long pfn, unsigned long nr_pages) | |||
163 | res.flags = IORESOURCE_MEM; /* we just need system ram */ | 163 | res.flags = IORESOURCE_MEM; /* we just need system ram */ |
164 | section_end = res.end; | 164 | section_end = res.end; |
165 | 165 | ||
166 | while (find_next_system_ram(&res) >= 0) { | 166 | while ((res.start < res.end) && (find_next_system_ram(&res) >= 0)) { |
167 | start_pfn = (unsigned long)(res.start >> PAGE_SHIFT); | 167 | start_pfn = (unsigned long)(res.start >> PAGE_SHIFT); |
168 | nr_pages = (unsigned long) | 168 | nr_pages = (unsigned long) |
169 | ((res.end + 1 - res.start) >> PAGE_SHIFT); | 169 | ((res.end + 1 - res.start) >> PAGE_SHIFT); |