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/ia64 | |
| parent | 7e1c1a82f505e79a85a822a377bd3369e676ac2d (diff) | |
| parent | 46ba51ea8f8639da32c55744b35479fdfb4e7232 (diff) | |
| download | blackbird-op-linux-8989e1cc35736b03948748343fb5ba42eb3bbfb8.tar.gz blackbird-op-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/ia64')
| -rw-r--r-- | arch/ia64/Kconfig | 1 | ||||
| -rw-r--r-- | arch/ia64/include/asm/acpi.h | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 2f3abcf8f6bc..44a6915ab13d 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig @@ -10,6 +10,7 @@ config IA64 select ARCH_MIGHT_HAVE_PC_SERIO select PCI if (!IA64_HP_SIM) select ACPI if (!IA64_HP_SIM) + select ARCH_MIGHT_HAVE_ACPI_PDC if ACPI select PM if (!IA64_HP_SIM) select HAVE_UNSTABLE_SCHED_CLOCK select HAVE_IDE diff --git a/arch/ia64/include/asm/acpi.h b/arch/ia64/include/asm/acpi.h index 75dc59a793d6..a1d91ab4c5ef 100644 --- a/arch/ia64/include/asm/acpi.h +++ b/arch/ia64/include/asm/acpi.h @@ -40,6 +40,11 @@ extern int acpi_lapic; #define acpi_noirq 0 /* ACPI always enabled on IA64 */ #define acpi_pci_disabled 0 /* ACPI PCI always enabled on IA64 */ #define acpi_strict 1 /* no ACPI spec workarounds on IA64 */ + +static inline bool acpi_has_cpu_in_madt(void) +{ + return !!acpi_lapic; +} #endif #define acpi_processor_cstate_check(x) (x) /* no idle limits on IA64 :) */ static inline void disable_acpi(void) { } |
