diff options
author | 2014-07-18 18:02:52 +0800 | |
---|---|---|
committer | 2014-07-21 13:50:58 +0200 | |
commit | 8a1664be0b922dd6afd60eca96a992ef5ec22c40 (patch) | |
tree | 3183bc4dad47bb9407236697dee8526455878e0b /drivers/acpi/osl.c | |
parent | Linux 3.16-rc6 (diff) | |
download | linux-8a1664be0b922dd6afd60eca96a992ef5ec22c40.tar.gz linux-8a1664be0b922dd6afd60eca96a992ef5ec22c40.tar.bz2 linux-8a1664be0b922dd6afd60eca96a992ef5ec22c40.zip |
ACPI: add config for BIOS table scan
With the addition of ARM64 that does not have a traditional BIOS to
scan, add a config option which is selected on x86 (ia64 doesn't need
it either, it is EFI/UEFI based system) to do the traditional BIOS
scanning for tables.
Signed-off-by: Graeme Gregory <graeme.gregory@linaro.org>
Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi/osl.c')
-rw-r--r-- | drivers/acpi/osl.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index bad25b070fe0..3abe9b223ba7 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c @@ -259,12 +259,14 @@ acpi_physical_address __init acpi_os_get_root_pointer(void) "System description tables not found\n"); return 0; } - } else { + } else if (IS_ENABLED(CONFIG_ACPI_LEGACY_TABLES_LOOKUP)) { acpi_physical_address pa = 0; acpi_find_root_pointer(&pa); return pa; } + + return 0; } /* Must be called with 'acpi_ioremap_lock' or RCU read lock held. */ |