Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1765638Ab3DDXw3 (ORCPT ); Thu, 4 Apr 2013 19:52:29 -0400 Received: from aserp1040.oracle.com ([141.146.126.69]:32201 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1765018Ab3DDXr4 (ORCPT ); Thu, 4 Apr 2013 19:47:56 -0400 From: Yinghai Lu To: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Andrew Morton , Tejun Heo , Thomas Renninger , Tang Chen Cc: linux-kernel@vger.kernel.org, Yinghai Lu , "Rafael J. Wysocki" , linux-acpi@vger.kernel.org Subject: [PATCH v3 04/22] x86, ACPI: Search buffer above 4G in second try for acpi override tables Date: Thu, 4 Apr 2013 16:46:08 -0700 Message-Id: <1365119186-23487-5-git-send-email-yinghai@kernel.org> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1365119186-23487-1-git-send-email-yinghai@kernel.org> References: <1365119186-23487-1-git-send-email-yinghai@kernel.org> X-Source-IP: acsinet22.oracle.com [141.146.126.238] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1170 Lines: 36 Now we only search buffer for override acpi table under 4G. In some case, like user use memmap to exclude all low ram, we may not find range for it under 4G. Do second try to search above 4G. Signed-off-by: Yinghai Lu Cc: "Rafael J. Wysocki" Cc: linux-acpi@vger.kernel.org --- drivers/acpi/osl.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index 313d14d..c08cdb6 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c @@ -627,6 +627,10 @@ void __init acpi_initrd_override(void *data, size_t size) /* under 4G at first, then above 4G */ acpi_tables_addr = memblock_find_in_range(0, (1ULL<<32) - 1, all_tables_size, PAGE_SIZE); + if (!acpi_tables_addr) + acpi_tables_addr = memblock_find_in_range(0, + ~(phys_addr_t)0, + all_tables_size, PAGE_SIZE); if (!acpi_tables_addr) { WARN_ON(1); return; -- 1.8.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/