diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2021-10-22 20:45:10 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2021-10-22 20:45:10 +0200 |
| commit | 7a7489005a80af97ba289dc0579fccd50af4fe8d (patch) | |
| tree | 493fdda6e8d2988be68a0999731e9d5eb79854c3 | |
| parent | bc28368596436e6e81ffc48c815b8225d96121c0 (diff) | |
| parent | 136f282028dae7d9dd68469b197aa2b36b410992 (diff) | |
Merge branch 'acpi-tools'acpi-5.15-rc7
Merge a fix for a recent ACPI tools bild regresson.
* acpi-tools:
ACPI: tools: fix compilation error
| -rw-r--r-- | include/acpi/platform/acgcc.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/include/acpi/platform/acgcc.h b/include/acpi/platform/acgcc.h index fb172a03a753..20ecb004f5a4 100644 --- a/include/acpi/platform/acgcc.h +++ b/include/acpi/platform/acgcc.h @@ -22,9 +22,14 @@ typedef __builtin_va_list va_list; #define va_arg(v, l) __builtin_va_arg(v, l) #define va_copy(d, s) __builtin_va_copy(d, s) #else +#ifdef __KERNEL__ #include <linux/stdarg.h> -#endif -#endif +#else +/* Used to build acpi tools */ +#include <stdarg.h> +#endif /* __KERNEL__ */ +#endif /* ACPI_USE_BUILTIN_STDARG */ +#endif /* ! va_arg */ #define ACPI_INLINE __inline__ |