From 41283b454b7abd3de251ec8234d19b67dbca3916 Mon Sep 17 00:00:00 2001
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Thu, 26 Sep 2024 21:36:17 +0000
Subject: [PATCH] LinuxKPI: always include linux/kconfig.h

Always include linux/kconfig.h which seems to match Linux behaviour
and avoid errors compiling code expected from that file but never
included.

Sponsored by:	The FreeBSD Foundation
MFC after:	3 days
Reviewed by:	emaste, imp
Differential Revision: https://reviews.freebsd.org/D46801
---
 sys/conf/kern.pre.mk | 3 ++-
 sys/conf/kmod.mk     | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk
index c676418aca9..50a81a29d18 100644
--- a/sys/conf/kern.pre.mk
+++ b/sys/conf/kern.pre.mk
@@ -324,7 +324,8 @@ NORMAL_CTFCONVERT=	@:
 
 # Linux Kernel Programming Interface C-flags
 LINUXKPI_INCLUDES=	-I$S/compat/linuxkpi/common/include \
-			-I$S/compat/linuxkpi/dummy/include
+			-I$S/compat/linuxkpi/dummy/include \
+			-include $S/compat/linuxkpi/common/include/linux/kconfig.h
 LINUXKPI_C=		${NORMAL_C} ${LINUXKPI_INCLUDES}
 
 # Infiniband C flags.  Correct include paths and omit errors that linux
diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk
index 4dc66c69d67..03bf42f5b41 100644
--- a/sys/conf/kmod.mk
+++ b/sys/conf/kmod.mk
@@ -109,7 +109,8 @@ LINUXKPI_GENSRCS+= \
 
 LINUXKPI_INCLUDES+= \
 	-I${SYSDIR}/compat/linuxkpi/common/include \
-	-I${SYSDIR}/compat/linuxkpi/dummy/include
+	-I${SYSDIR}/compat/linuxkpi/dummy/include \
+	-include ${SYSDIR}/compat/linuxkpi/common/include/linux/kconfig.h
 
 CFLAGS+=	${WERROR}
 CFLAGS+=	-D_KERNEL