diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-02-08 11:26:07 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-02-08 11:26:07 +0100 |
| commit | b1738e3ebac570a647648a679a54c033813beb68 (patch) | |
| tree | 2720050a1c88d085af74956c2f63c4c82cab3237 /include/acpi/platform/aclinux.h | |
| parent | 43cdd1b716b26f6af16da4e145b6578f98798bf6 (diff) | |
| parent | 9481a2c5c1d9920938297e47509716fff43aa601 (diff) | |
| download | talos-op-linux-b1738e3ebac570a647648a679a54c033813beb68.tar.gz talos-op-linux-b1738e3ebac570a647648a679a54c033813beb68.zip | |
Merge branch 'acpica'
* acpica:
ACPICA: Update version to 20180105
ACPICA: All acpica: Update copyrights to 2018
ACPICA: Add a missing pair of parentheses
ACPICA: Prefer ACPI_TO_POINTER() over ACPI_ADD_PTR()
ACPICA: Avoid NULL pointer arithmetic
ACPICA: Linux: add support for X32 ABI compilation
Diffstat (limited to 'include/acpi/platform/aclinux.h')
| -rw-r--r-- | include/acpi/platform/aclinux.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/acpi/platform/aclinux.h b/include/acpi/platform/aclinux.h index 1b473efd9eb6..adee92c38c43 100644 --- a/include/acpi/platform/aclinux.h +++ b/include/acpi/platform/aclinux.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2017, Intel Corp. + * Copyright (C) 2000 - 2018, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -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 |
