diff options
| author | Christoph Hellwig <hch@lst.de> | 2019-08-13 09:25:05 +0200 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2019-08-16 11:33:57 -0700 |
| commit | 2e0f2b1659ddd7bb005ca0bf9f92915904974676 (patch) | |
| tree | 4cec4f2568ad1f0dc2540d9ca81ffd72a394e48f /arch/ia64/include/asm/acpi.h | |
| parent | 768557ca5b062e14ccdc55d255f7ff50bb90d40a (diff) | |
ia64: remove CONFIG_ACPI ifdefs
Now that hpsim support is gone, CONFIG_ACPI is forced on for ia64, and
we can remove a few ifdefs for it.
Acked-by: Tom Vaden <tom.vaden@hpe.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Link: https://lkml.kernel.org/r/20190813072514.23299-20-hch@lst.de
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64/include/asm/acpi.h')
| -rw-r--r-- | arch/ia64/include/asm/acpi.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/include/asm/acpi.h b/arch/ia64/include/asm/acpi.h index 0afb3bc4b4a1..01c1c269aa13 100644 --- a/arch/ia64/include/asm/acpi.h +++ b/arch/ia64/include/asm/acpi.h @@ -17,7 +17,7 @@ #include <linux/numa.h> #include <asm/numa.h> -#ifdef CONFIG_ACPI + extern int acpi_lapic; #define acpi_disabled 0 /* ACPI always enabled on IA64 */ #define acpi_noirq 0 /* ACPI always enabled on IA64 */ @@ -28,7 +28,7 @@ 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) { } |