summaryrefslogtreecommitdiffstats
path: root/include/acpi/platform
diff options
context:
space:
mode:
authorAnuj Mittal <anuj.mittal@intel.com>2018-01-25 00:42:29 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2018-02-04 08:58:30 +0100
commit0eedae8e5f983aba6fb5c29c8699ecf03c7e50e0 (patch)
treeb780c3886550afde3f82604c33ede61d5d3c20c8 /include/acpi/platform
parentMerge tag 'acpi-4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ra... (diff)
downloadlinux-0eedae8e5f983aba6fb5c29c8699ecf03c7e50e0.tar.xz
linux-0eedae8e5f983aba6fb5c29c8699ecf03c7e50e0.zip
ACPICA: Linux: add support for X32 ABI compilation
X32 follows ILP32 model. Check for ILP32 as well when checking for x86_64 to ensure the defines are correct for X32 ABI. Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Erik Schmauss <erik.schmauss@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'include/acpi/platform')
-rw-r--r--include/acpi/platform/aclinux.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/acpi/platform/aclinux.h b/include/acpi/platform/aclinux.h
index 1b473efd9eb6..97e088276c6d 100644
--- a/include/acpi/platform/aclinux.h
+++ b/include/acpi/platform/aclinux.h
@@ -206,7 +206,7 @@
#define ACPI_FLUSH_CPU_CACHE()
#define ACPI_CAST_PTHREAD_T(pthread) ((acpi_thread_id) (pthread))
-#if defined(__ia64__) || defined(__x86_64__) ||\
+#if defined(__ia64__) || (defined(__x86_64__) && !defined(__ILP32__)) ||\
defined(__aarch64__) || defined(__PPC64__) ||\
defined(__s390x__)
#define ACPI_MACHINE_WIDTH 64