diff options
| author | Lv Zheng <lv.zheng@intel.com> | 2014-07-16 16:58:08 +0800 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2015-09-18 13:40:14 +0200 |
| commit | 4e8ea81c4e888b755f0d04d213aa61c676bb7f9b (patch) | |
| tree | 87bbd17aa9482b6b5dd3b470f1bc071836a030b7 | |
| parent | 388cd149fef4b33eeb599846f0b47ad1035b1a1d (diff) | |
ACPICA: Linux: Add support to exclude <asm/acenv.h> inclusion.
The forthcoming patch will make <acpi/acpi.h> to be visible to all kernel
source code. Thus for the architectures that do not support ACPI and
haven't implemented <asm/acenv.h>, we need to make it excluded.
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
(cherry picked from commit d334c823b27401721591e0f1220050a41af08165)
| -rw-r--r-- | arch/ia64/include/asm/acenv.h | 4 | ||||
| -rw-r--r-- | arch/x86/include/asm/acenv.h | 4 | ||||
| -rw-r--r-- | include/acpi/platform/aclinux.h | 2 |
3 files changed, 2 insertions, 8 deletions
diff --git a/arch/ia64/include/asm/acenv.h b/arch/ia64/include/asm/acenv.h index e0896eb26bf1..052bf891fdb9 100644 --- a/arch/ia64/include/asm/acenv.h +++ b/arch/ia64/include/asm/acenv.h @@ -34,8 +34,6 @@ #define ACPI_FLUSH_CPU_CACHE() -#ifdef CONFIG_ACPI - static inline int ia64_acpi_acquire_global_lock(unsigned int *lock) { @@ -66,6 +64,4 @@ ia64_acpi_release_global_lock(unsigned int *lock) #define ACPI_RELEASE_GLOBAL_LOCK(facs, Acq) \ ((Acq) = ia64_acpi_release_global_lock(&facs->global_lock)) -#endif - #endif /* _ASM_IA64_ACENV_H */ diff --git a/arch/x86/include/asm/acenv.h b/arch/x86/include/asm/acenv.h index 6978584934f7..2e78f12d53fe 100644 --- a/arch/x86/include/asm/acenv.h +++ b/arch/x86/include/asm/acenv.h @@ -34,8 +34,6 @@ #define ACPI_FLUSH_CPU_CACHE() wbinvd() -#ifdef CONFIG_ACPI - int __acpi_acquire_global_lock(unsigned int *lock); int __acpi_release_global_lock(unsigned int *lock); @@ -60,6 +58,4 @@ int __acpi_release_global_lock(unsigned int *lock); : "=r"(n_hi), "=r"(n_lo) \ : "0"(n_hi), "1"(n_lo)) -#endif - #endif /* _ASM_X86_ACENV_H */ diff --git a/include/acpi/platform/aclinux.h b/include/acpi/platform/aclinux.h index 934bbeb1d243..b8537456dd7f 100644 --- a/include/acpi/platform/aclinux.h +++ b/include/acpi/platform/aclinux.h @@ -65,7 +65,9 @@ #ifdef EXPORT_ACPI_INTERFACES #include <linux/export.h> #endif +#ifdef CONFIG_ACPI #include <asm/acenv.h> +#endif /* Host-dependent types and defines for in-kernel ACPICA */ |