diff options
Diffstat (limited to 'drivers/acpi/osl.c')
-rw-r--r-- | drivers/acpi/osl.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index 3bb46cb24a99..7ca41bf023c9 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c | |||
@@ -189,12 +189,15 @@ early_param("acpi_rsdp", setup_acpi_rsdp); | |||
189 | 189 | ||
190 | acpi_physical_address __init acpi_os_get_root_pointer(void) | 190 | acpi_physical_address __init acpi_os_get_root_pointer(void) |
191 | { | 191 | { |
192 | acpi_physical_address pa = 0; | 192 | acpi_physical_address pa; |
193 | 193 | ||
194 | #ifdef CONFIG_KEXEC | 194 | #ifdef CONFIG_KEXEC |
195 | if (acpi_rsdp) | 195 | if (acpi_rsdp) |
196 | return acpi_rsdp; | 196 | return acpi_rsdp; |
197 | #endif | 197 | #endif |
198 | pa = acpi_arch_get_root_pointer(); | ||
199 | if (pa) | ||
200 | return pa; | ||
198 | 201 | ||
199 | if (efi_enabled(EFI_CONFIG_TABLES)) { | 202 | if (efi_enabled(EFI_CONFIG_TABLES)) { |
200 | if (efi.acpi20 != EFI_INVALID_TABLE_ADDR) | 203 | if (efi.acpi20 != EFI_INVALID_TABLE_ADDR) |