File tree Expand file tree Collapse file tree 2 files changed +11
-1
lines changed Expand file tree Collapse file tree 2 files changed +11
-1
lines changed Original file line number Diff line number Diff line change @@ -189,12 +189,15 @@ early_param("acpi_rsdp", setup_acpi_rsdp);
189
189
190
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
194
#ifdef CONFIG_KEXEC
195
195
if (acpi_rsdp )
196
196
return acpi_rsdp ;
197
197
#endif
198
+ pa = acpi_arch_get_root_pointer ();
199
+ if (pa )
200
+ return pa ;
198
201
199
202
if (efi_enabled (EFI_CONFIG_TABLES )) {
200
203
if (efi .acpi20 != EFI_INVALID_TABLE_ADDR )
Original file line number Diff line number Diff line change @@ -623,6 +623,13 @@ bool acpi_gtdt_c3stop(int type);
623
623
int acpi_arch_timer_mem_init (struct arch_timer_mem * timer_mem , int * timer_count );
624
624
#endif
625
625
626
+ #ifndef ACPI_HAVE_ARCH_GET_ROOT_POINTER
627
+ static inline u64 acpi_arch_get_root_pointer (void )
628
+ {
629
+ return 0 ;
630
+ }
631
+ #endif
632
+
626
633
#else /* !CONFIG_ACPI */
627
634
628
635
#define acpi_disabled 1
You can’t perform that action at this time.
0 commit comments