From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756858AbcJNAAi (ORCPT ); Thu, 13 Oct 2016 20:00:38 -0400 Received: from szxga02-in.huawei.com ([119.145.14.65]:49299 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751708AbcJNAAX (ORCPT ); Thu, 13 Oct 2016 20:00:23 -0400 From: Yisheng Xie To: , , , , CC: , , , , Subject: [PATCH] ACPICA: arm64: fix compile apci tools fail for arm64 Date: Fri, 14 Oct 2016 07:51:38 +0800 Message-ID: <1476402698-40963-1-git-send-email-xieyisheng1@huawei.com> X-Mailer: git-send-email 1.7.12.4 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.175.102.37] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org when try to cross compile acpi tool in dir kernel/tools for arm64 use command: make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- acpi it failed with the following log: In file included from ../../../../../include/acpi/acpi.h:58:0, from ../../../../../drivers/acpi/acpica/utstring.c:44: ../../../../../include/acpi/actypes.h:130:34: error: conflicting types for 's64' typedef signed long long s64; ^ In file included from /opt/aarch64-linux-gnu/libc/usr/include/asm-generic/types.h:6:0 from /opt/aarch64-linux-gnu/libc/usr/include/asm/types.h:1, from ../../../../../include/uapi/linux/types.h:4, from ../../../../../include/linux/types.h:5, from /opt/aarch64-linux-gnu/libc/usr/include/asm/sigcontext.h:19, from /opt/aarch64-linux-gnu/libc/usr/include/bits/sigcontext.h:27, from /opt/aarch64-linux-gnu/libc/usr/include/signal.h:308, from ../../../../../include/acpi/platform/acenv.h:365, from ../../../../../include/acpi/acpi.h:56, from ./acpidump.h:55, from ../../os_specific/service_layers/oslinuxtbl.c:44: ../../../../../include/asm-generic/int-ll64.h:24:26: note: previous declaration of 's64' was here typedef signed long long s64; ^ Fix this compile problem. Fixes: e323c02dee59 ("ACPICA: MSVC9: Fix inclusion order issue") Signed-off-by: Yisheng Xie --- include/acpi/platform/acenv.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/acpi/platform/acenv.h b/include/acpi/platform/acenv.h index 34cce72..0089fa0 100644 --- a/include/acpi/platform/acenv.h +++ b/include/acpi/platform/acenv.h @@ -361,9 +361,13 @@ #include #include #include +#ifdef __aarch64__ +#include +#else #include #include #endif +#endif #endif /* ACPI_USE_STANDARD_HEADERS */ -- 1.7.12.4