[PATCH] memory hotadd fixes: avoid check in acpi
add_memory() does all necessary check to avoid collision. then, acpi layer doesn't have to check region by itself. (*) pfn_valid() just returns page struct is valid or not. It returns 0 if a section has been already added even is ioresource is not added. ioresource collision check in mm/memory_hotplug.c can do more precise collistion check. added enabled bit check just for sanity check.. 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> Cc: "Brown, Len" <len.brown@intel.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
58c1b5b079
commit
fa25d8d6d3
|
@ -230,17 +230,10 @@ static int acpi_memory_enable_device(struct acpi_memory_device *mem_device)
|
||||||
* (i.e. memory-hot-remove function)
|
* (i.e. memory-hot-remove function)
|
||||||
*/
|
*/
|
||||||
list_for_each_entry(info, &mem_device->res_list, list) {
|
list_for_each_entry(info, &mem_device->res_list, list) {
|
||||||
u64 start_pfn, end_pfn;
|
if (info->enabled) { /* just sanity check...*/
|
||||||
|
|
||||||
start_pfn = info->start_addr >> PAGE_SHIFT;
|
|
||||||
end_pfn = (info->start_addr + info->length - 1) >> PAGE_SHIFT;
|
|
||||||
|
|
||||||
if (pfn_valid(start_pfn) || pfn_valid(end_pfn)) {
|
|
||||||
/* already enabled. try next area */
|
|
||||||
num_enabled++;
|
num_enabled++;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
result = add_memory(node, info->start_addr, info->length);
|
result = add_memory(node, info->start_addr, info->length);
|
||||||
if (result)
|
if (result)
|
||||||
continue;
|
continue;
|
||||||
|
|
Loading…
Reference in New Issue