|
@@ -189,12 +189,15 @@ early_param("acpi_rsdp", setup_acpi_rsdp);
|
|
|
|
|
|
acpi_physical_address __init acpi_os_get_root_pointer(void)
|
|
acpi_physical_address __init acpi_os_get_root_pointer(void)
|
|
{
|
|
{
|
|
- acpi_physical_address pa = 0;
|
|
|
|
|
|
+ acpi_physical_address pa;
|
|
|
|
|
|
#ifdef CONFIG_KEXEC
|
|
#ifdef CONFIG_KEXEC
|
|
if (acpi_rsdp)
|
|
if (acpi_rsdp)
|
|
return acpi_rsdp;
|
|
return acpi_rsdp;
|
|
#endif
|
|
#endif
|
|
|
|
+ pa = acpi_arch_get_root_pointer();
|
|
|
|
+ if (pa)
|
|
|
|
+ return pa;
|
|
|
|
|
|
if (efi_enabled(EFI_CONFIG_TABLES)) {
|
|
if (efi_enabled(EFI_CONFIG_TABLES)) {
|
|
if (efi.acpi20 != EFI_INVALID_TABLE_ADDR)
|
|
if (efi.acpi20 != EFI_INVALID_TABLE_ADDR)
|