diff options
| author | Lv Zheng <lv.zheng@intel.com> | 2017-02-08 11:00:01 +0800 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-02-09 14:35:59 +0100 |
| commit | ffab9188e444854882dbc291500d576d6bad7b7b (patch) | |
| tree | 10e42910878a1cf727893d11013cb29d35b9e751 /include/acpi/platform/acenv.h | |
| parent | 1b62d134d3c5f9e67de096af7ea3e9fe48966f17 (diff) | |
ACPICA: Linuxize: Restore and fix Intel compiler build
ACPICA commit b59347d0b8b676cb555fe8da5cad08fcd4eeb0d3
The following commit cleans up compiler specific inclusions:
Commit: 9fa1cebdbfff3db8953cebca8ee327d75edefc40
Subject: ACPICA: OSL: Cleanup the inclusion order of the compiler-specific headers
But breaks one thing due to the following old issue:
Buidling Linux kernel with Intel compiler originally depends on acgcc.h
not acintel.h.
So after making Intel compiler build working in ACPICA upstream by
correctly using acintel.h, it becomes unable to build Linux kernel using
Intel compiler as there is no acintel.h in the kernel source tree.
This patch releases acintel.h to Linux kernel and fixes its inclusion in
acenv.h.
Fixes: 9fa1cebdbfff (ACPICA: OSL: Cleanup the inclusion order of the compiler-specific headers)
Link: https://github.com/acpica/acpica/commit/b59347d0
Cc: 4.9+ <stable@vger.kernel.org> # 4.9+
Tested-by: Stepan M Mishura <stepan.m.mishura@intel.com>
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'include/acpi/platform/acenv.h')
| -rw-r--r-- | include/acpi/platform/acenv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/acpi/platform/acenv.h b/include/acpi/platform/acenv.h index 926efe997479..6fa9c52659a3 100644 --- a/include/acpi/platform/acenv.h +++ b/include/acpi/platform/acenv.h @@ -178,7 +178,7 @@ #include "acmsvc.h" #elif defined(__INTEL_COMPILER) -#include "acintel.h" +#include <acpi/platform/acintel.h> #endif |