diff options
author | Takashi Iwai <tiwai@suse.de> | 2022-01-05 15:38:11 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2022-01-05 15:38:34 +0100 |
commit | f81483aaeb59da530b286fe5d081e1705eb5c886 (patch) | |
tree | a4fed750afcdf61df3a2e3c7ab4456c515651290 /include/acpi/platform/acgcc.h | |
parent | ALSA: hda/realtek: Use ALC285_FIXUP_HP_GPIO_LED on another HP laptop (diff) | |
parent | ALSA: hda/cs8409: Fix Jack detection after resume (diff) | |
download | linux-f81483aaeb59da530b286fe5d081e1705eb5c886.tar.xz linux-f81483aaeb59da530b286fe5d081e1705eb5c886.zip |
Merge branch 'for-next' into for-linus
Pull 5.17 materials.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include/acpi/platform/acgcc.h')
-rw-r--r-- | include/acpi/platform/acgcc.h | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/include/acpi/platform/acgcc.h b/include/acpi/platform/acgcc.h index fb172a03a753..33ad282bd338 100644 --- a/include/acpi/platform/acgcc.h +++ b/include/acpi/platform/acgcc.h @@ -10,21 +10,13 @@ #ifndef __ACGCC_H__ #define __ACGCC_H__ -/* - * Use compiler specific <stdarg.h> is a good practice for even when - * -nostdinc is specified (i.e., ACPI_USE_STANDARD_HEADERS undefined. - */ #ifndef va_arg -#ifdef ACPI_USE_BUILTIN_STDARG -typedef __builtin_va_list va_list; -#define va_start(v, l) __builtin_va_start(v, l) -#define va_end(v) __builtin_va_end(v) -#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 +#include <stdarg.h> +#endif /* __KERNEL__ */ +#endif /* ! va_arg */ #define ACPI_INLINE __inline__ |