git: 44126818d2ec - main - infiniband: Disable -Wredundant-decl warnings.

[John Baldwin]

The branch main has been updated by jhb:

URL: https://cgit.FreeBSD.org/src/commit/?id=44126818d2ec96d8247eafcae9b96905a473a264

commit 44126818d2ec96d8247eafcae9b96905a473a264
Author:     John Baldwin <jhb at FreeBSD.org>
AuthorDate: 2021-09-15 16:03:18 +0000
Commit:     John Baldwin <jhb at FreeBSD.org>
CommitDate: 2021-09-15 16:03:18 +0000

    infiniband: Disable -Wredundant-decl warnings.
    
    ib_uverbs_flow_resources_free() is declard in two header files in
    upstream OFED.  Disable the warning to avoid introducing diffs to fix
    the build on GCC 9.
    
    While here, fix the ibcore module to disable the same warnings
    disabled in OFED_CFLAGS.
    
    Reviewed by:    hselasky
    Differential Revision:  https://reviews.freebsd.org/D31943
---
 sys/conf/kern.pre.mk        | 2 +-
 sys/modules/ibcore/Makefile | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk
index d9621273c57b..9d9e32027ec7 100644
--- a/sys/conf/kern.pre.mk
+++ b/sys/conf/kern.pre.mk
@@ -297,7 +297,7 @@ LINUXKPI_C=		${NORMAL_C} ${LINUXKPI_INCLUDES}
 # Infiniband C flags.  Correct include paths and omit errors that linux
 # does not honor.
 OFEDINCLUDES=	-I$S/ofed/include -I$S/ofed/include/uapi ${LINUXKPI_INCLUDES}
-OFEDNOERR=	-Wno-cast-qual -Wno-pointer-arith
+OFEDNOERR=	-Wno-cast-qual -Wno-pointer-arith -Wno-redundant-decls
 OFEDCFLAGS=	${CFLAGS:N-I*} -DCONFIG_INFINIBAND_USER_MEM \
 		${OFEDINCLUDES} ${CFLAGS:M-I*} ${OFEDNOERR}
 OFED_C_NOIMP=	${CC} -c -o ${.TARGET} ${OFEDCFLAGS} ${WERROR}
diff --git a/sys/modules/ibcore/Makefile b/sys/modules/ibcore/Makefile
index 00d7ed976416..951f0abab453 100644
--- a/sys/modules/ibcore/Makefile
+++ b/sys/modules/ibcore/Makefile
@@ -53,3 +53,5 @@ CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include
 CFLAGS+= -DINET6 -DINET -DCONFIG_INFINIBAND_USER_MEM
 
 .include <bsd.kmod.mk>
+
+CWARNFLAGS+= -Wno-cast-qual -Wno-pointer-arith -Wno-redundant-decls