From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

Date: Fri, 27 Jan 2023 08:57:50 -0500

Subject: [PATCH] selftests: x86: Fix incorrect kernel headers search path

References: bsc#1012628

Patch-mainline: 6.2.3

Git-commit: ac5ec90e94fe8eddb4499e51398640fa6a89d657

commit ac5ec90e94fe8eddb4499e51398640fa6a89d657 upstream.

Use $(KHDR_INCLUDES) as lookup path for kernel headers. This prevents

building against kernel headers from the build environment in scenarios

where kernel headers are installed into a specific output directory

(O=...).

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

Cc: Shuah Khan <shuah@kernel.org>

Cc: linux-kselftest@vger.kernel.org

Cc: Ingo Molnar <mingo@redhat.com>

Cc: <stable@vger.kernel.org>  # 5.18+

Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Signed-off-by: Jiri Slaby <jslaby@suse.cz>

---

 tools/testing/selftests/x86/Makefile | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/testing/selftests/x86/Makefile b/tools/testing/selftests/x86/Makefile

index 0388c4d6..ca9374b5 100644

--- a/tools/testing/selftests/x86/Makefile

+++ b/tools/testing/selftests/x86/Makefile

@@ -34,7 +34,7 @@ BINARIES_64 := $(TARGETS_C_64BIT_ALL:%=%_64)

 BINARIES_32 := $(patsubst %,$(OUTPUT)/%,$(BINARIES_32))

 BINARIES_64 := $(patsubst %,$(OUTPUT)/%,$(BINARIES_64))

-CFLAGS := -O2 -g -std=gnu99 -pthread -Wall

+CFLAGS := -O2 -g -std=gnu99 -pthread -Wall $(KHDR_INCLUDES)

 # call32_from_64 in thunks.S uses absolute addresses.

 ifeq ($(CAN_BUILD_WITH_NOPIE),1)

-- 

2.35.3