Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Lv Zheng and committed by
Rafael J. Wysocki
ffab9188 1b62d134

+88 -1
+1 -1
include/acpi/platform/acenv.h
··· 178 178 #include "acmsvc.h" 179 179 180 180 #elif defined(__INTEL_COMPILER) 181 - #include "acintel.h" 181 + #include <acpi/platform/acintel.h> 182 182 183 183 #endif 184 184
+87
include/acpi/platform/acintel.h
··· 1 + /****************************************************************************** 2 + * 3 + * Name: acintel.h - VC specific defines, etc. 4 + * 5 + *****************************************************************************/ 6 + 7 + /* 8 + * Copyright (C) 2000 - 2017, Intel Corp. 9 + * All rights reserved. 10 + * 11 + * Redistribution and use in source and binary forms, with or without 12 + * modification, are permitted provided that the following conditions 13 + * are met: 14 + * 1. Redistributions of source code must retain the above copyright 15 + * notice, this list of conditions, and the following disclaimer, 16 + * without modification. 17 + * 2. Redistributions in binary form must reproduce at minimum a disclaimer 18 + * substantially similar to the "NO WARRANTY" disclaimer below 19 + * ("Disclaimer") and any redistribution must be conditioned upon 20 + * including a substantially similar Disclaimer requirement for further 21 + * binary redistribution. 22 + * 3. Neither the names of the above-listed copyright holders nor the names 23 + * of any contributors may be used to endorse or promote products derived 24 + * from this software without specific prior written permission. 25 + * 26 + * Alternatively, this software may be distributed under the terms of the 27 + * GNU General Public License ("GPL") version 2 as published by the Free 28 + * Software Foundation. 29 + * 30 + * NO WARRANTY 31 + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 32 + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 33 + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR 34 + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 35 + * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 36 + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 37 + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 38 + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 39 + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 40 + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 41 + * POSSIBILITY OF SUCH DAMAGES. 42 + */ 43 + 44 + #ifndef __ACINTEL_H__ 45 + #define __ACINTEL_H__ 46 + 47 + /* 48 + * Use compiler specific <stdarg.h> is a good practice for even when 49 + * -nostdinc is specified (i.e., ACPI_USE_STANDARD_HEADERS undefined. 50 + */ 51 + #include <stdarg.h> 52 + 53 + /* Configuration specific to Intel 64-bit C compiler */ 54 + 55 + #define COMPILER_DEPENDENT_INT64 __int64 56 + #define COMPILER_DEPENDENT_UINT64 unsigned __int64 57 + #define ACPI_INLINE __inline 58 + 59 + /* 60 + * Calling conventions: 61 + * 62 + * ACPI_SYSTEM_XFACE - Interfaces to host OS (handlers, threads) 63 + * ACPI_EXTERNAL_XFACE - External ACPI interfaces 64 + * ACPI_INTERNAL_XFACE - Internal ACPI interfaces 65 + * ACPI_INTERNAL_VAR_XFACE - Internal variable-parameter list interfaces 66 + */ 67 + #define ACPI_SYSTEM_XFACE 68 + #define ACPI_EXTERNAL_XFACE 69 + #define ACPI_INTERNAL_XFACE 70 + #define ACPI_INTERNAL_VAR_XFACE 71 + 72 + /* remark 981 - operands evaluated in no particular order */ 73 + #pragma warning(disable:981) 74 + 75 + /* warn C4100: unreferenced formal parameter */ 76 + #pragma warning(disable:4100) 77 + 78 + /* warn C4127: conditional expression is constant */ 79 + #pragma warning(disable:4127) 80 + 81 + /* warn C4706: assignment within conditional expression */ 82 + #pragma warning(disable:4706) 83 + 84 + /* warn C4214: bit field types other than int */ 85 + #pragma warning(disable:4214) 86 + 87 + #endif /* __ACINTEL_H__ */