diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-07-27 23:52:48 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-07-27 23:52:48 +0200 |
| commit | 8989e1cc35736b03948748343fb5ba42eb3bbfb8 (patch) | |
| tree | 44feb210db2812c90761095c5e7411531d27ba83 /arch/x86 | |
| parent | Merge branch 'acpi-headers' (diff) | |
| parent | ACPI / processor: Introduce ARCH_MIGHT_HAVE_ACPI_PDC (diff) | |
| download | linux-8989e1cc35736b03948748343fb5ba42eb3bbfb8.tar.xz linux-8989e1cc35736b03948748343fb5ba42eb3bbfb8.zip | |
Merge branch 'acpi-config'
* acpi-config:
ACPI / processor: Introduce ARCH_MIGHT_HAVE_ACPI_PDC
ACPI: Don't use acpi_lapic in ACPI core code
ACPI: add config for BIOS table scan
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/Kconfig | 2 | ||||
| -rw-r--r-- | arch/x86/include/asm/acpi.h | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index d24887b645dc..70c43b5371bb 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -21,6 +21,7 @@ config X86_64 ### Arch settings config X86 def_bool y + select ARCH_MIGHT_HAVE_ACPI_PDC if ACPI select ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS select ARCH_MIGHT_HAVE_PC_PARPORT select ARCH_MIGHT_HAVE_PC_SERIO @@ -132,6 +133,7 @@ config X86 select GENERIC_CPU_AUTOPROBE select HAVE_ARCH_AUDITSYSCALL select ARCH_SUPPORTS_ATOMIC_RMW + select ACPI_LEGACY_TABLES_LOOKUP if ACPI config INSTRUCTION_DECODER def_bool y diff --git a/arch/x86/include/asm/acpi.h b/arch/x86/include/asm/acpi.h index e06225eda635..0ab4f9fd2687 100644 --- a/arch/x86/include/asm/acpi.h +++ b/arch/x86/include/asm/acpi.h @@ -121,6 +121,11 @@ static inline void arch_acpi_set_pdc_bits(u32 *buf) buf[2] &= ~(ACPI_PDC_C_C2C3_FFH); } +static inline bool acpi_has_cpu_in_madt(void) +{ + return !!acpi_lapic; +} + #else /* !CONFIG_ACPI */ #define acpi_lapic 0 |