aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/platform
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2011-07-12 03:58:05 -0400
committerH. Peter Anvin <hpa@linux.intel.com>2011-07-13 19:35:52 -0400
commitbf61549a2d8e0326f5d6e4d1718883a7212d725f (patch)
tree38ae5c938a71e96da996b53fc49edba28b63df36 /arch/x86/platform
parent1e01979c8f502ac13e3cdece4f38712c5944e6e8 (diff)
x86: Fix memblock_x86_check_reserved_size() use in efi_reserve_boot_services()
The return value of memblock_x86_check_reserved_size() doesn't indicate whether there's an overlapping reservatoin or not. It indicates whether the caller needs to iterate further to discover all reserved portions of the specified area. efi_reserve_boot_esrvices() wants to check whether the boot services area overlaps with other reservations but incorrectly used membloc_x86_check_reserved_size(). Use memblock_is_region_reserved() instead. Signed-off-by: Tejun Heo <tj@kernel.org> Link: http://lkml.kernel.org/r/1310457490-3356-2-git-send-email-tj@kernel.org Cc: Yinghai Lu <yinghai@kernel.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@redhat.com> Cc: "H. Peter Anvin" <hpa@zytor.com> Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86/platform')
-rw-r--r--arch/x86/platform/efi/efi.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
index 899e393d8e73..a4c322ca1a5d 100644
--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
@@ -325,8 +325,7 @@ void __init efi_reserve_boot_services(void)
325 if ((start+size >= virt_to_phys(_text) 325 if ((start+size >= virt_to_phys(_text)
326 && start <= virt_to_phys(_end)) || 326 && start <= virt_to_phys(_end)) ||
327 !e820_all_mapped(start, start+size, E820_RAM) || 327 !e820_all_mapped(start, start+size, E820_RAM) ||
328 memblock_x86_check_reserved_size(&start, &size, 328 memblock_is_region_reserved(start, size)) {
329 1<<EFI_PAGE_SHIFT)) {
330 /* Could not reserve, skip it */ 329 /* Could not reserve, skip it */
331 md->num_pages = 0; 330 md->num_pages = 0;
332 memblock_dbg(PFX "Could not reserve boot range " 331 memblock_dbg(PFX "Could not reserve boot range "