From 3daa6e97330d23ae46c4389e4041c61c1a1d76d9 Mon Sep 17 00:00:00 2001 From: Cheyenne Wills Date: Tue, 16 Nov 2021 10:55:30 -0700 Subject: [PATCH] LINUX-5.16: Use linux/stdarg.h if available Global use of the compiler option '-isystem' was removed from the top level Makefile with Linux commit ('isystem: delete global -isystem compile option' 04e85bbf7). This results with an error due to not finding "stdarg.h" when building the openafs kernel module. .../src/rx/rx_kcommon.h:143:12: fatal error: stdarg.h: No such file or directory 143 | # include "stdarg.h" | ^~~~~~~~~~ Linux-5.15, introduced a copy of stdarg.h as 'linux/stdarg.h' in commit ('isystem: ship and use stdarg.h' c0891ac15) Add a test for the linux/stdarg.h include file and if available, use "linux/stdarg.h" instead of "stdarg.h" within the Linux kernel module. Change-Id: I5215182c8240034bd739688a88a9410b74f93c8f Reviewed-on: https://gerrit.openafs.org/14844 Tested-by: BuildBot Reviewed-by: Benjamin Kaduk --- src/cf/linux-kernel-header.m4 | 1 + src/rx/rx_kcommon.h | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/cf/linux-kernel-header.m4 b/src/cf/linux-kernel-header.m4 index c7f989e0f0..8507eaaabf 100644 --- a/src/cf/linux-kernel-header.m4 +++ b/src/cf/linux-kernel-header.m4 @@ -9,4 +9,5 @@ AC_CHECK_LINUX_HEADER([semaphore.h]) AC_CHECK_LINUX_HEADER([seq_file.h]) AC_CHECK_LINUX_HEADER([sched/signal.h]) AC_CHECK_LINUX_HEADER([uaccess.h]) +AC_CHECK_LINUX_HEADER([stdarg.h]) ]) diff --git a/src/rx/rx_kcommon.h b/src/rx/rx_kcommon.h index 6a640e678c..8d8a330a6f 100644 --- a/src/rx/rx_kcommon.h +++ b/src/rx/rx_kcommon.h @@ -140,7 +140,11 @@ struct coda_inode_info { # if defined(AFS_FBSD_ENV) # include "machine/stdarg.h" # else -# include "stdarg.h" +# if defined(HAVE_LINUX_STDARG_H) +# include "linux/stdarg.h" +# else +# include "stdarg.h" +# endif # endif #endif #ifdef KERNEL