From 1ae219dd27c9907521e17f32dd976729beb15d14 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 6 Mar 2023 19:18:05 +0100 Subject: [PATCH] 6.1-stable patches added patches: selftests-arm64-fix-incorrect-kernel-headers-search-path.patch selftests-clone3-fix-incorrect-kernel-headers-search-path.patch selftests-dmabuf-heaps-fix-incorrect-kernel-headers-search-path.patch selftests-drivers-fix-incorrect-kernel-headers-search-path.patch selftests-filesystems-fix-incorrect-kernel-headers-search-path.patch selftests-futex-fix-incorrect-kernel-headers-search-path.patch selftests-gpio-fix-incorrect-kernel-headers-search-path.patch selftests-ipc-fix-incorrect-kernel-headers-search-path.patch selftests-kcmp-fix-incorrect-kernel-headers-search-path.patch selftests-media_tests-fix-incorrect-kernel-headers-search-path.patch selftests-membarrier-fix-incorrect-kernel-headers-search-path.patch selftests-mount_setattr-fix-incorrect-kernel-headers-search-path.patch selftests-move_mount_set_group-fix-incorrect-kernel-headers-search-path.patch selftests-perf_events-fix-incorrect-kernel-headers-search-path.patch selftests-pid_namespace-fix-incorrect-kernel-headers-search-path.patch selftests-pidfd-fix-incorrect-kernel-headers-search-path.patch selftests-ptp-fix-incorrect-kernel-headers-search-path.patch selftests-rseq-fix-incorrect-kernel-headers-search-path.patch selftests-seccomp-fix-incorrect-kernel-headers-search-path.patch selftests-sync-fix-incorrect-kernel-headers-search-path.patch selftests-user_events-fix-incorrect-kernel-headers-search-path.patch selftests-vm-fix-incorrect-kernel-headers-search-path.patch --- ...incorrect-kernel-headers-search-path.patch | 49 ++++++++++++++++ ...incorrect-kernel-headers-search-path.patch | 36 ++++++++++++ ...incorrect-kernel-headers-search-path.patch | 49 ++++++++++++++++ ...incorrect-kernel-headers-search-path.patch | 49 ++++++++++++++++ ...incorrect-kernel-headers-search-path.patch | 57 +++++++++++++++++++ ...incorrect-kernel-headers-search-path.patch | 34 +++++++++++ ...incorrect-kernel-headers-search-path.patch | 35 ++++++++++++ ...incorrect-kernel-headers-search-path.patch | 36 ++++++++++++ ...incorrect-kernel-headers-search-path.patch | 34 +++++++++++ ...incorrect-kernel-headers-search-path.patch | 35 ++++++++++++ ...incorrect-kernel-headers-search-path.patch | 34 +++++++++++ ...incorrect-kernel-headers-search-path.patch | 35 ++++++++++++ ...incorrect-kernel-headers-search-path.patch | 35 ++++++++++++ ...incorrect-kernel-headers-search-path.patch | 34 +++++++++++ ...incorrect-kernel-headers-search-path.patch | 34 +++++++++++ ...incorrect-kernel-headers-search-path.patch | 34 +++++++++++ ...incorrect-kernel-headers-search-path.patch | 34 +++++++++++ ...incorrect-kernel-headers-search-path.patch | 36 ++++++++++++ ...incorrect-kernel-headers-search-path.patch | 34 +++++++++++ ...incorrect-kernel-headers-search-path.patch | 36 ++++++++++++ ...incorrect-kernel-headers-search-path.patch | 34 +++++++++++ ...incorrect-kernel-headers-search-path.patch | 36 ++++++++++++ queue-6.1/series | 22 +++++++ 23 files changed, 852 insertions(+) create mode 100644 queue-6.1/selftests-arm64-fix-incorrect-kernel-headers-search-path.patch create mode 100644 queue-6.1/selftests-clone3-fix-incorrect-kernel-headers-search-path.patch create mode 100644 queue-6.1/selftests-dmabuf-heaps-fix-incorrect-kernel-headers-search-path.patch create mode 100644 queue-6.1/selftests-drivers-fix-incorrect-kernel-headers-search-path.patch create mode 100644 queue-6.1/selftests-filesystems-fix-incorrect-kernel-headers-search-path.patch create mode 100644 queue-6.1/selftests-futex-fix-incorrect-kernel-headers-search-path.patch create mode 100644 queue-6.1/selftests-gpio-fix-incorrect-kernel-headers-search-path.patch create mode 100644 queue-6.1/selftests-ipc-fix-incorrect-kernel-headers-search-path.patch create mode 100644 queue-6.1/selftests-kcmp-fix-incorrect-kernel-headers-search-path.patch create mode 100644 queue-6.1/selftests-media_tests-fix-incorrect-kernel-headers-search-path.patch create mode 100644 queue-6.1/selftests-membarrier-fix-incorrect-kernel-headers-search-path.patch create mode 100644 queue-6.1/selftests-mount_setattr-fix-incorrect-kernel-headers-search-path.patch create mode 100644 queue-6.1/selftests-move_mount_set_group-fix-incorrect-kernel-headers-search-path.patch create mode 100644 queue-6.1/selftests-perf_events-fix-incorrect-kernel-headers-search-path.patch create mode 100644 queue-6.1/selftests-pid_namespace-fix-incorrect-kernel-headers-search-path.patch create mode 100644 queue-6.1/selftests-pidfd-fix-incorrect-kernel-headers-search-path.patch create mode 100644 queue-6.1/selftests-ptp-fix-incorrect-kernel-headers-search-path.patch create mode 100644 queue-6.1/selftests-rseq-fix-incorrect-kernel-headers-search-path.patch create mode 100644 queue-6.1/selftests-seccomp-fix-incorrect-kernel-headers-search-path.patch create mode 100644 queue-6.1/selftests-sync-fix-incorrect-kernel-headers-search-path.patch create mode 100644 queue-6.1/selftests-user_events-fix-incorrect-kernel-headers-search-path.patch create mode 100644 queue-6.1/selftests-vm-fix-incorrect-kernel-headers-search-path.patch diff --git a/queue-6.1/selftests-arm64-fix-incorrect-kernel-headers-search-path.patch b/queue-6.1/selftests-arm64-fix-incorrect-kernel-headers-search-path.patch new file mode 100644 index 00000000000..2129dda5011 --- /dev/null +++ b/queue-6.1/selftests-arm64-fix-incorrect-kernel-headers-search-path.patch @@ -0,0 +1,49 @@ +From 7482c19173b7eb044d476b3444d7ee55bc669d03 Mon Sep 17 00:00:00 2001 +From: Mathieu Desnoyers +Date: Fri, 27 Jan 2023 08:57:22 -0500 +Subject: selftests: arm64: Fix incorrect kernel headers search path + +From: Mathieu Desnoyers + +commit 7482c19173b7eb044d476b3444d7ee55bc669d03 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 +Cc: Shuah Khan +Cc: linux-kselftest@vger.kernel.org +Cc: Ingo Molnar +Cc: # 5.18+ +Acked-by: Shuah Khan +Acked-by: Catalin Marinas +Signed-off-by: Shuah Khan +Signed-off-by: Greg Kroah-Hartman +--- + tools/testing/selftests/arm64/fp/Makefile | 2 +- + tools/testing/selftests/arm64/tags/Makefile | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +--- a/tools/testing/selftests/arm64/fp/Makefile ++++ b/tools/testing/selftests/arm64/fp/Makefile +@@ -3,7 +3,7 @@ + # A proper top_srcdir is needed by KSFT(lib.mk) + top_srcdir = $(realpath ../../../../../) + +-CFLAGS += -I$(top_srcdir)/usr/include/ ++CFLAGS += $(KHDR_INCLUDES) + + TEST_GEN_PROGS := fp-stress \ + sve-ptrace sve-probe-vls \ +--- a/tools/testing/selftests/arm64/tags/Makefile ++++ b/tools/testing/selftests/arm64/tags/Makefile +@@ -1,6 +1,6 @@ + # SPDX-License-Identifier: GPL-2.0 + +-CFLAGS += -I../../../../../usr/include/ ++CFLAGS += $(KHDR_INCLUDES) + TEST_GEN_PROGS := tags_test + TEST_PROGS := run_tags_test.sh + diff --git a/queue-6.1/selftests-clone3-fix-incorrect-kernel-headers-search-path.patch b/queue-6.1/selftests-clone3-fix-incorrect-kernel-headers-search-path.patch new file mode 100644 index 00000000000..c426fbf8b69 --- /dev/null +++ b/queue-6.1/selftests-clone3-fix-incorrect-kernel-headers-search-path.patch @@ -0,0 +1,36 @@ +From 612cf4d283414a5ee2733db6608d917deb45fa46 Mon Sep 17 00:00:00 2001 +From: Mathieu Desnoyers +Date: Fri, 27 Jan 2023 08:57:24 -0500 +Subject: selftests: clone3: Fix incorrect kernel headers search path + +From: Mathieu Desnoyers + +commit 612cf4d283414a5ee2733db6608d917deb45fa46 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 +Cc: Shuah Khan +Cc: linux-kselftest@vger.kernel.org +Cc: Ingo Molnar +Cc: # 5.18+ +Acked-by: Shuah Khan +Acked-by: Christian Brauner +Signed-off-by: Shuah Khan +Signed-off-by: Greg Kroah-Hartman +--- + tools/testing/selftests/clone3/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/tools/testing/selftests/clone3/Makefile ++++ b/tools/testing/selftests/clone3/Makefile +@@ -1,5 +1,5 @@ + # SPDX-License-Identifier: GPL-2.0 +-CFLAGS += -g -std=gnu99 -I../../../../usr/include/ ++CFLAGS += -g -std=gnu99 $(KHDR_INCLUDES) + LDLIBS += -lcap + + TEST_GEN_PROGS := clone3 clone3_clear_sighand clone3_set_tid \ diff --git a/queue-6.1/selftests-dmabuf-heaps-fix-incorrect-kernel-headers-search-path.patch b/queue-6.1/selftests-dmabuf-heaps-fix-incorrect-kernel-headers-search-path.patch new file mode 100644 index 00000000000..bb7a2210824 --- /dev/null +++ b/queue-6.1/selftests-dmabuf-heaps-fix-incorrect-kernel-headers-search-path.patch @@ -0,0 +1,49 @@ +From f80f09b59fdd45753dd80ac623981ad00ece4c2d Mon Sep 17 00:00:00 2001 +From: Mathieu Desnoyers +Date: Fri, 27 Jan 2023 08:57:27 -0500 +Subject: selftests: dmabuf-heaps: Fix incorrect kernel headers search path + +From: Mathieu Desnoyers + +commit f80f09b59fdd45753dd80ac623981ad00ece4c2d 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 +Cc: Shuah Khan +Cc: linux-kselftest@vger.kernel.org +Cc: Ingo Molnar +Cc: # 5.18+ +Signed-off-by: Shuah Khan +Signed-off-by: Greg Kroah-Hartman +--- + tools/testing/selftests/dmabuf-heaps/Makefile | 2 +- + tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c | 3 +-- + 2 files changed, 2 insertions(+), 3 deletions(-) + +--- a/tools/testing/selftests/dmabuf-heaps/Makefile ++++ b/tools/testing/selftests/dmabuf-heaps/Makefile +@@ -1,5 +1,5 @@ + # SPDX-License-Identifier: GPL-2.0 +-CFLAGS += -static -O3 -Wl,-no-as-needed -Wall ++CFLAGS += -static -O3 -Wl,-no-as-needed -Wall $(KHDR_INCLUDES) + + TEST_GEN_PROGS = dmabuf-heap + +--- a/tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c ++++ b/tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c +@@ -13,10 +13,9 @@ + #include + + #include ++#include + #include + +-#include "../../../../include/uapi/linux/dma-heap.h" +- + #define DEVPATH "/dev/dma_heap" + + static int check_vgem(int fd) diff --git a/queue-6.1/selftests-drivers-fix-incorrect-kernel-headers-search-path.patch b/queue-6.1/selftests-drivers-fix-incorrect-kernel-headers-search-path.patch new file mode 100644 index 00000000000..9c614e2dd91 --- /dev/null +++ b/queue-6.1/selftests-drivers-fix-incorrect-kernel-headers-search-path.patch @@ -0,0 +1,49 @@ +From 07f0148aafe8c95a3a76cd59e9e75b4d78d1d31d Mon Sep 17 00:00:00 2001 +From: Mathieu Desnoyers +Date: Fri, 27 Jan 2023 08:57:28 -0500 +Subject: selftests: drivers: Fix incorrect kernel headers search path + +From: Mathieu Desnoyers + +commit 07f0148aafe8c95a3a76cd59e9e75b4d78d1d31d 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 +Cc: Shuah Khan +Cc: linux-kselftest@vger.kernel.org +Cc: Ingo Molnar +Cc: # 5.18+ +Signed-off-by: Shuah Khan +Signed-off-by: Greg Kroah-Hartman +--- + tools/testing/selftests/drivers/dma-buf/Makefile | 2 +- + tools/testing/selftests/drivers/s390x/uvdevice/Makefile | 3 +-- + 2 files changed, 2 insertions(+), 3 deletions(-) + +--- a/tools/testing/selftests/drivers/dma-buf/Makefile ++++ b/tools/testing/selftests/drivers/dma-buf/Makefile +@@ -1,5 +1,5 @@ + # SPDX-License-Identifier: GPL-2.0-only +-CFLAGS += -I../../../../../usr/include/ ++CFLAGS += $(KHDR_INCLUDES) + + TEST_GEN_PROGS := udmabuf + +--- a/tools/testing/selftests/drivers/s390x/uvdevice/Makefile ++++ b/tools/testing/selftests/drivers/s390x/uvdevice/Makefile +@@ -11,10 +11,9 @@ else + TEST_GEN_PROGS := test_uvdevice + + top_srcdir ?= ../../../../../.. +-khdr_dir = $(top_srcdir)/usr/include + LINUX_TOOL_ARCH_INCLUDE = $(top_srcdir)/tools/arch/$(ARCH)/include + +-CFLAGS += -Wall -Werror -static -I$(khdr_dir) -I$(LINUX_TOOL_ARCH_INCLUDE) ++CFLAGS += -Wall -Werror -static $(KHDR_INCLUDES) -I$(LINUX_TOOL_ARCH_INCLUDE) + + include ../../../lib.mk + diff --git a/queue-6.1/selftests-filesystems-fix-incorrect-kernel-headers-search-path.patch b/queue-6.1/selftests-filesystems-fix-incorrect-kernel-headers-search-path.patch new file mode 100644 index 00000000000..df61960cfcd --- /dev/null +++ b/queue-6.1/selftests-filesystems-fix-incorrect-kernel-headers-search-path.patch @@ -0,0 +1,57 @@ +From c2d3cf3653a8ff6e4b402d55e7f84790ac08a8ad Mon Sep 17 00:00:00 2001 +From: Mathieu Desnoyers +Date: Fri, 27 Jan 2023 08:57:29 -0500 +Subject: selftests: filesystems: Fix incorrect kernel headers search path + +From: Mathieu Desnoyers + +commit c2d3cf3653a8ff6e4b402d55e7f84790ac08a8ad 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 +Cc: Shuah Khan +Cc: linux-kselftest@vger.kernel.org +Cc: Ingo Molnar +Cc: # 5.18+ +Signed-off-by: Shuah Khan +Signed-off-by: Greg Kroah-Hartman +--- + tools/testing/selftests/filesystems/Makefile | 2 +- + tools/testing/selftests/filesystems/binderfs/Makefile | 2 +- + tools/testing/selftests/filesystems/epoll/Makefile | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +--- a/tools/testing/selftests/filesystems/Makefile ++++ b/tools/testing/selftests/filesystems/Makefile +@@ -1,6 +1,6 @@ + # SPDX-License-Identifier: GPL-2.0 + +-CFLAGS += -I../../../../usr/include/ ++CFLAGS += $(KHDR_INCLUDES) + TEST_GEN_PROGS := devpts_pts + TEST_GEN_PROGS_EXTENDED := dnotify_test + +--- a/tools/testing/selftests/filesystems/binderfs/Makefile ++++ b/tools/testing/selftests/filesystems/binderfs/Makefile +@@ -1,6 +1,6 @@ + # SPDX-License-Identifier: GPL-2.0 + +-CFLAGS += -I../../../../../usr/include/ -pthread ++CFLAGS += $(KHDR_INCLUDES) -pthread + TEST_GEN_PROGS := binderfs_test + + binderfs_test: binderfs_test.c ../../kselftest.h ../../kselftest_harness.h +--- a/tools/testing/selftests/filesystems/epoll/Makefile ++++ b/tools/testing/selftests/filesystems/epoll/Makefile +@@ -1,6 +1,6 @@ + # SPDX-License-Identifier: GPL-2.0 + +-CFLAGS += -I../../../../../usr/include/ ++CFLAGS += $(KHDR_INCLUDES) + LDLIBS += -lpthread + TEST_GEN_PROGS := epoll_wakeup_test + diff --git a/queue-6.1/selftests-futex-fix-incorrect-kernel-headers-search-path.patch b/queue-6.1/selftests-futex-fix-incorrect-kernel-headers-search-path.patch new file mode 100644 index 00000000000..25121ad4fc1 --- /dev/null +++ b/queue-6.1/selftests-futex-fix-incorrect-kernel-headers-search-path.patch @@ -0,0 +1,34 @@ +From 24c55275ba0d538def2b1220002d0e808a85d50f Mon Sep 17 00:00:00 2001 +From: Mathieu Desnoyers +Date: Fri, 27 Jan 2023 08:57:30 -0500 +Subject: selftests: futex: Fix incorrect kernel headers search path + +From: Mathieu Desnoyers + +commit 24c55275ba0d538def2b1220002d0e808a85d50f 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 +Cc: Shuah Khan +Cc: linux-kselftest@vger.kernel.org +Cc: Ingo Molnar +Cc: # 5.18+ +Signed-off-by: Shuah Khan +Signed-off-by: Greg Kroah-Hartman +--- + tools/testing/selftests/futex/functional/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/tools/testing/selftests/futex/functional/Makefile ++++ b/tools/testing/selftests/futex/functional/Makefile +@@ -1,5 +1,5 @@ + # SPDX-License-Identifier: GPL-2.0 +-INCLUDES := -I../include -I../../ -I../../../../../usr/include/ ++INCLUDES := -I../include -I../../ $(KHDR_INCLUDES) + CFLAGS := $(CFLAGS) -g -O2 -Wall -D_GNU_SOURCE -pthread $(INCLUDES) $(KHDR_INCLUDES) + LDLIBS := -lpthread -lrt + diff --git a/queue-6.1/selftests-gpio-fix-incorrect-kernel-headers-search-path.patch b/queue-6.1/selftests-gpio-fix-incorrect-kernel-headers-search-path.patch new file mode 100644 index 00000000000..837144b4009 --- /dev/null +++ b/queue-6.1/selftests-gpio-fix-incorrect-kernel-headers-search-path.patch @@ -0,0 +1,35 @@ +From 8bb9c1808628babcc7b99ec2439bf102379bd4ac Mon Sep 17 00:00:00 2001 +From: Mathieu Desnoyers +Date: Fri, 27 Jan 2023 08:57:31 -0500 +Subject: selftests: gpio: Fix incorrect kernel headers search path + +From: Mathieu Desnoyers + +commit 8bb9c1808628babcc7b99ec2439bf102379bd4ac 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 +Cc: Shuah Khan +Cc: linux-kselftest@vger.kernel.org +Cc: Ingo Molnar +Cc: # 5.18+ +Signed-off-by: Shuah Khan +Signed-off-by: Greg Kroah-Hartman +--- + tools/testing/selftests/gpio/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/tools/testing/selftests/gpio/Makefile ++++ b/tools/testing/selftests/gpio/Makefile +@@ -3,6 +3,6 @@ + TEST_PROGS := gpio-mockup.sh gpio-sim.sh + TEST_FILES := gpio-mockup-sysfs.sh + TEST_GEN_PROGS_EXTENDED := gpio-mockup-cdev gpio-chip-info gpio-line-name +-CFLAGS += -O2 -g -Wall -I../../../../usr/include/ $(KHDR_INCLUDES) ++CFLAGS += -O2 -g -Wall $(KHDR_INCLUDES) + + include ../lib.mk diff --git a/queue-6.1/selftests-ipc-fix-incorrect-kernel-headers-search-path.patch b/queue-6.1/selftests-ipc-fix-incorrect-kernel-headers-search-path.patch new file mode 100644 index 00000000000..5998866834b --- /dev/null +++ b/queue-6.1/selftests-ipc-fix-incorrect-kernel-headers-search-path.patch @@ -0,0 +1,36 @@ +From ecf9fdb5c2a9d63c732acccb6318feb73dd1589f Mon Sep 17 00:00:00 2001 +From: Mathieu Desnoyers +Date: Fri, 27 Jan 2023 08:57:32 -0500 +Subject: selftests: ipc: Fix incorrect kernel headers search path + +From: Mathieu Desnoyers + +commit ecf9fdb5c2a9d63c732acccb6318feb73dd1589f 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 +Cc: Shuah Khan +Cc: linux-kselftest@vger.kernel.org +Cc: Ingo Molnar +Cc: # 5.18+ +Signed-off-by: Shuah Khan +Signed-off-by: Greg Kroah-Hartman +--- + tools/testing/selftests/ipc/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/tools/testing/selftests/ipc/Makefile ++++ b/tools/testing/selftests/ipc/Makefile +@@ -10,7 +10,7 @@ ifeq ($(ARCH),x86_64) + CFLAGS := -DCONFIG_X86_64 -D__x86_64__ + endif + +-CFLAGS += -I../../../../usr/include/ ++CFLAGS += $(KHDR_INCLUDES) + + TEST_GEN_PROGS := msgque + diff --git a/queue-6.1/selftests-kcmp-fix-incorrect-kernel-headers-search-path.patch b/queue-6.1/selftests-kcmp-fix-incorrect-kernel-headers-search-path.patch new file mode 100644 index 00000000000..20226ebc4b7 --- /dev/null +++ b/queue-6.1/selftests-kcmp-fix-incorrect-kernel-headers-search-path.patch @@ -0,0 +1,34 @@ +From 5d74231a2caad259f6669d8d6112814cef6bcd60 Mon Sep 17 00:00:00 2001 +From: Mathieu Desnoyers +Date: Fri, 27 Jan 2023 08:57:33 -0500 +Subject: selftests: kcmp: Fix incorrect kernel headers search path + +From: Mathieu Desnoyers + +commit 5d74231a2caad259f6669d8d6112814cef6bcd60 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 +Cc: Shuah Khan +Cc: linux-kselftest@vger.kernel.org +Cc: Ingo Molnar +Cc: # 5.18+ +Signed-off-by: Shuah Khan +Signed-off-by: Greg Kroah-Hartman +--- + tools/testing/selftests/kcmp/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/tools/testing/selftests/kcmp/Makefile ++++ b/tools/testing/selftests/kcmp/Makefile +@@ -1,5 +1,5 @@ + # SPDX-License-Identifier: GPL-2.0-only +-CFLAGS += -I../../../../usr/include/ ++CFLAGS += $(KHDR_INCLUDES) + + TEST_GEN_PROGS := kcmp_test + diff --git a/queue-6.1/selftests-media_tests-fix-incorrect-kernel-headers-search-path.patch b/queue-6.1/selftests-media_tests-fix-incorrect-kernel-headers-search-path.patch new file mode 100644 index 00000000000..9c8e5eefe93 --- /dev/null +++ b/queue-6.1/selftests-media_tests-fix-incorrect-kernel-headers-search-path.patch @@ -0,0 +1,35 @@ +From f2f9592b736087f695230410fb8dc1afd3cafbbb Mon Sep 17 00:00:00 2001 +From: Mathieu Desnoyers +Date: Fri, 27 Jan 2023 08:57:34 -0500 +Subject: selftests: media_tests: Fix incorrect kernel headers search path + +From: Mathieu Desnoyers + +commit f2f9592b736087f695230410fb8dc1afd3cafbbb 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 +Cc: Shuah Khan +Cc: linux-kselftest@vger.kernel.org +Cc: Ingo Molnar +Cc: # 5.18+ +Signed-off-by: Shuah Khan +Signed-off-by: Greg Kroah-Hartman +--- + tools/testing/selftests/media_tests/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/tools/testing/selftests/media_tests/Makefile ++++ b/tools/testing/selftests/media_tests/Makefile +@@ -1,6 +1,6 @@ + # SPDX-License-Identifier: GPL-2.0 + # +-CFLAGS += -I../ -I../../../../usr/include/ ++CFLAGS += -I../ $(KHDR_INCLUDES) + TEST_GEN_PROGS := media_device_test media_device_open video_device_test + + include ../lib.mk diff --git a/queue-6.1/selftests-membarrier-fix-incorrect-kernel-headers-search-path.patch b/queue-6.1/selftests-membarrier-fix-incorrect-kernel-headers-search-path.patch new file mode 100644 index 00000000000..5790fcb14e2 --- /dev/null +++ b/queue-6.1/selftests-membarrier-fix-incorrect-kernel-headers-search-path.patch @@ -0,0 +1,34 @@ +From 498bb027726371ba4a94686d251f9be1d437573e Mon Sep 17 00:00:00 2001 +From: Mathieu Desnoyers +Date: Fri, 27 Jan 2023 08:57:35 -0500 +Subject: selftests: membarrier: Fix incorrect kernel headers search path + +From: Mathieu Desnoyers + +commit 498bb027726371ba4a94686d251f9be1d437573e 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 +Cc: Shuah Khan +Cc: linux-kselftest@vger.kernel.org +Cc: Ingo Molnar +Cc: # 5.18+ +Signed-off-by: Shuah Khan +Signed-off-by: Greg Kroah-Hartman +--- + tools/testing/selftests/membarrier/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/tools/testing/selftests/membarrier/Makefile ++++ b/tools/testing/selftests/membarrier/Makefile +@@ -1,5 +1,5 @@ + # SPDX-License-Identifier: GPL-2.0-only +-CFLAGS += -g -I../../../../usr/include/ ++CFLAGS += -g $(KHDR_INCLUDES) + LDLIBS += -lpthread + + TEST_GEN_PROGS := membarrier_test_single_thread \ diff --git a/queue-6.1/selftests-mount_setattr-fix-incorrect-kernel-headers-search-path.patch b/queue-6.1/selftests-mount_setattr-fix-incorrect-kernel-headers-search-path.patch new file mode 100644 index 00000000000..5c19657e802 --- /dev/null +++ b/queue-6.1/selftests-mount_setattr-fix-incorrect-kernel-headers-search-path.patch @@ -0,0 +1,35 @@ +From 5d11f2d0eb39d2b5c5e8f05e1f650c4a4de69918 Mon Sep 17 00:00:00 2001 +From: Mathieu Desnoyers +Date: Fri, 27 Jan 2023 08:57:36 -0500 +Subject: selftests: mount_setattr: Fix incorrect kernel headers search path + +From: Mathieu Desnoyers + +commit 5d11f2d0eb39d2b5c5e8f05e1f650c4a4de69918 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 +Cc: Shuah Khan +Cc: linux-kselftest@vger.kernel.org +Cc: Ingo Molnar +Cc: # 5.18+ +Signed-off-by: Shuah Khan +Signed-off-by: Greg Kroah-Hartman +--- + tools/testing/selftests/mount_setattr/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/tools/testing/selftests/mount_setattr/Makefile ++++ b/tools/testing/selftests/mount_setattr/Makefile +@@ -1,6 +1,6 @@ + # SPDX-License-Identifier: GPL-2.0 + # Makefile for mount selftests. +-CFLAGS = -g -I../../../../usr/include/ -Wall -O2 -pthread ++CFLAGS = -g $(KHDR_INCLUDES) -Wall -O2 -pthread + + TEST_GEN_FILES += mount_setattr_test + diff --git a/queue-6.1/selftests-move_mount_set_group-fix-incorrect-kernel-headers-search-path.patch b/queue-6.1/selftests-move_mount_set_group-fix-incorrect-kernel-headers-search-path.patch new file mode 100644 index 00000000000..b064225d933 --- /dev/null +++ b/queue-6.1/selftests-move_mount_set_group-fix-incorrect-kernel-headers-search-path.patch @@ -0,0 +1,35 @@ +From 65c68af0131bfef8e395c325735b6c40638cb931 Mon Sep 17 00:00:00 2001 +From: Mathieu Desnoyers +Date: Fri, 27 Jan 2023 08:57:37 -0500 +Subject: selftests: move_mount_set_group: Fix incorrect kernel headers search path + +From: Mathieu Desnoyers + +commit 65c68af0131bfef8e395c325735b6c40638cb931 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 +Cc: Shuah Khan +Cc: linux-kselftest@vger.kernel.org +Cc: Ingo Molnar +Cc: # 5.18+ +Signed-off-by: Shuah Khan +Signed-off-by: Greg Kroah-Hartman +--- + tools/testing/selftests/move_mount_set_group/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/tools/testing/selftests/move_mount_set_group/Makefile ++++ b/tools/testing/selftests/move_mount_set_group/Makefile +@@ -1,6 +1,6 @@ + # SPDX-License-Identifier: GPL-2.0 + # Makefile for mount selftests. +-CFLAGS = -g -I../../../../usr/include/ -Wall -O2 ++CFLAGS = -g $(KHDR_INCLUDES) -Wall -O2 + + TEST_GEN_FILES += move_mount_set_group_test + diff --git a/queue-6.1/selftests-perf_events-fix-incorrect-kernel-headers-search-path.patch b/queue-6.1/selftests-perf_events-fix-incorrect-kernel-headers-search-path.patch new file mode 100644 index 00000000000..91f82dcdedb --- /dev/null +++ b/queue-6.1/selftests-perf_events-fix-incorrect-kernel-headers-search-path.patch @@ -0,0 +1,34 @@ +From 465cbb1b9a9fd5f6907adb2d761facaf1a46bfbe Mon Sep 17 00:00:00 2001 +From: Mathieu Desnoyers +Date: Fri, 27 Jan 2023 08:57:39 -0500 +Subject: selftests: perf_events: Fix incorrect kernel headers search path + +From: Mathieu Desnoyers + +commit 465cbb1b9a9fd5f6907adb2d761facaf1a46bfbe 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 +Cc: Shuah Khan +Cc: linux-kselftest@vger.kernel.org +Cc: Ingo Molnar +Cc: # 5.18+ +Signed-off-by: Shuah Khan +Signed-off-by: Greg Kroah-Hartman +--- + tools/testing/selftests/perf_events/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/tools/testing/selftests/perf_events/Makefile ++++ b/tools/testing/selftests/perf_events/Makefile +@@ -1,5 +1,5 @@ + # SPDX-License-Identifier: GPL-2.0 +-CFLAGS += -Wl,-no-as-needed -Wall -I../../../../usr/include ++CFLAGS += -Wl,-no-as-needed -Wall $(KHDR_INCLUDES) + LDFLAGS += -lpthread + + TEST_GEN_PROGS := sigtrap_threads remove_on_exec diff --git a/queue-6.1/selftests-pid_namespace-fix-incorrect-kernel-headers-search-path.patch b/queue-6.1/selftests-pid_namespace-fix-incorrect-kernel-headers-search-path.patch new file mode 100644 index 00000000000..59190f70f89 --- /dev/null +++ b/queue-6.1/selftests-pid_namespace-fix-incorrect-kernel-headers-search-path.patch @@ -0,0 +1,34 @@ +From e81ff69f66969a16a98a2e0977c1860f1c182c74 Mon Sep 17 00:00:00 2001 +From: Mathieu Desnoyers +Date: Fri, 27 Jan 2023 08:57:40 -0500 +Subject: selftests: pid_namespace: Fix incorrect kernel headers search path + +From: Mathieu Desnoyers + +commit e81ff69f66969a16a98a2e0977c1860f1c182c74 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 +Cc: Shuah Khan +Cc: linux-kselftest@vger.kernel.org +Cc: Ingo Molnar +Cc: # 5.18+ +Signed-off-by: Shuah Khan +Signed-off-by: Greg Kroah-Hartman +--- + tools/testing/selftests/pid_namespace/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/tools/testing/selftests/pid_namespace/Makefile ++++ b/tools/testing/selftests/pid_namespace/Makefile +@@ -1,5 +1,5 @@ + # SPDX-License-Identifier: GPL-2.0 +-CFLAGS += -g -I../../../../usr/include/ ++CFLAGS += -g $(KHDR_INCLUDES) + + TEST_GEN_PROGS = regression_enomem + diff --git a/queue-6.1/selftests-pidfd-fix-incorrect-kernel-headers-search-path.patch b/queue-6.1/selftests-pidfd-fix-incorrect-kernel-headers-search-path.patch new file mode 100644 index 00000000000..43c0213fe8b --- /dev/null +++ b/queue-6.1/selftests-pidfd-fix-incorrect-kernel-headers-search-path.patch @@ -0,0 +1,34 @@ +From 3f7d71768795c386019f2295c1986d00035c9f0f Mon Sep 17 00:00:00 2001 +From: Mathieu Desnoyers +Date: Fri, 27 Jan 2023 08:57:41 -0500 +Subject: selftests: pidfd: Fix incorrect kernel headers search path + +From: Mathieu Desnoyers + +commit 3f7d71768795c386019f2295c1986d00035c9f0f 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 +Cc: Shuah Khan +Cc: linux-kselftest@vger.kernel.org +Cc: Ingo Molnar +Cc: # 5.18+ +Signed-off-by: Shuah Khan +Signed-off-by: Greg Kroah-Hartman +--- + tools/testing/selftests/pidfd/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/tools/testing/selftests/pidfd/Makefile ++++ b/tools/testing/selftests/pidfd/Makefile +@@ -1,5 +1,5 @@ + # SPDX-License-Identifier: GPL-2.0-only +-CFLAGS += -g -I../../../../usr/include/ -pthread -Wall ++CFLAGS += -g $(KHDR_INCLUDES) -pthread -Wall + + TEST_GEN_PROGS := pidfd_test pidfd_fdinfo_test pidfd_open_test \ + pidfd_poll_test pidfd_wait pidfd_getfd_test pidfd_setns_test diff --git a/queue-6.1/selftests-ptp-fix-incorrect-kernel-headers-search-path.patch b/queue-6.1/selftests-ptp-fix-incorrect-kernel-headers-search-path.patch new file mode 100644 index 00000000000..abd3020d5c9 --- /dev/null +++ b/queue-6.1/selftests-ptp-fix-incorrect-kernel-headers-search-path.patch @@ -0,0 +1,34 @@ +From 01ede99e9de16e7a1ed689c99f41022aa878f2f4 Mon Sep 17 00:00:00 2001 +From: Mathieu Desnoyers +Date: Fri, 27 Jan 2023 08:57:43 -0500 +Subject: selftests: ptp: Fix incorrect kernel headers search path + +From: Mathieu Desnoyers + +commit 01ede99e9de16e7a1ed689c99f41022aa878f2f4 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 +Cc: Shuah Khan +Cc: linux-kselftest@vger.kernel.org +Cc: Ingo Molnar +Cc: # 5.18+ +Signed-off-by: Shuah Khan +Signed-off-by: Greg Kroah-Hartman +--- + tools/testing/selftests/ptp/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/tools/testing/selftests/ptp/Makefile ++++ b/tools/testing/selftests/ptp/Makefile +@@ -1,5 +1,5 @@ + # SPDX-License-Identifier: GPL-2.0 +-CFLAGS += -I../../../../usr/include/ ++CFLAGS += $(KHDR_INCLUDES) + TEST_PROGS := testptp + LDLIBS += -lrt + all: $(TEST_PROGS) diff --git a/queue-6.1/selftests-rseq-fix-incorrect-kernel-headers-search-path.patch b/queue-6.1/selftests-rseq-fix-incorrect-kernel-headers-search-path.patch new file mode 100644 index 00000000000..12fd2aa8bc5 --- /dev/null +++ b/queue-6.1/selftests-rseq-fix-incorrect-kernel-headers-search-path.patch @@ -0,0 +1,36 @@ +From 2279bfc03211045c8f43a76b01889a5ca86acd5a Mon Sep 17 00:00:00 2001 +From: Mathieu Desnoyers +Date: Fri, 27 Jan 2023 08:57:44 -0500 +Subject: selftests: rseq: Fix incorrect kernel headers search path + +From: Mathieu Desnoyers + +commit 2279bfc03211045c8f43a76b01889a5ca86acd5a 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 +Cc: Shuah Khan +Cc: linux-kselftest@vger.kernel.org +Cc: Ingo Molnar +Cc: # 5.18+ +Signed-off-by: Shuah Khan +Signed-off-by: Greg Kroah-Hartman +--- + tools/testing/selftests/rseq/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/tools/testing/selftests/rseq/Makefile ++++ b/tools/testing/selftests/rseq/Makefile +@@ -4,7 +4,7 @@ ifneq ($(shell $(CC) --version 2>&1 | he + CLANG_FLAGS += -no-integrated-as + endif + +-CFLAGS += -O2 -Wall -g -I./ -I../../../../usr/include/ -L$(OUTPUT) -Wl,-rpath=./ \ ++CFLAGS += -O2 -Wall -g -I./ $(KHDR_INCLUDES) -L$(OUTPUT) -Wl,-rpath=./ \ + $(CLANG_FLAGS) + LDLIBS += -lpthread -ldl + diff --git a/queue-6.1/selftests-seccomp-fix-incorrect-kernel-headers-search-path.patch b/queue-6.1/selftests-seccomp-fix-incorrect-kernel-headers-search-path.patch new file mode 100644 index 00000000000..bbf929742c2 --- /dev/null +++ b/queue-6.1/selftests-seccomp-fix-incorrect-kernel-headers-search-path.patch @@ -0,0 +1,34 @@ +From 07d42dd854446ba3177ad7a217870a5b4edee165 Mon Sep 17 00:00:00 2001 +From: Mathieu Desnoyers +Date: Fri, 27 Jan 2023 08:57:46 -0500 +Subject: selftests: seccomp: Fix incorrect kernel headers search path + +From: Mathieu Desnoyers + +commit 07d42dd854446ba3177ad7a217870a5b4edee165 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 +Cc: Shuah Khan +Cc: linux-kselftest@vger.kernel.org +Cc: Ingo Molnar +Cc: # 5.18+ +Signed-off-by: Shuah Khan +Signed-off-by: Greg Kroah-Hartman +--- + tools/testing/selftests/seccomp/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/tools/testing/selftests/seccomp/Makefile ++++ b/tools/testing/selftests/seccomp/Makefile +@@ -1,5 +1,5 @@ + # SPDX-License-Identifier: GPL-2.0 +-CFLAGS += -Wl,-no-as-needed -Wall -isystem ../../../../usr/include/ ++CFLAGS += -Wl,-no-as-needed -Wall $(KHDR_INCLUDES) + LDFLAGS += -lpthread + LDLIBS += -lcap + diff --git a/queue-6.1/selftests-sync-fix-incorrect-kernel-headers-search-path.patch b/queue-6.1/selftests-sync-fix-incorrect-kernel-headers-search-path.patch new file mode 100644 index 00000000000..25fee7cded4 --- /dev/null +++ b/queue-6.1/selftests-sync-fix-incorrect-kernel-headers-search-path.patch @@ -0,0 +1,36 @@ +From 5ad0c8e42c13623bd996e19ce76f2596e16eb0db Mon Sep 17 00:00:00 2001 +From: Mathieu Desnoyers +Date: Fri, 27 Jan 2023 08:57:47 -0500 +Subject: selftests: sync: Fix incorrect kernel headers search path + +From: Mathieu Desnoyers + +commit 5ad0c8e42c13623bd996e19ce76f2596e16eb0db 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 +Cc: Shuah Khan +Cc: linux-kselftest@vger.kernel.org +Cc: Ingo Molnar +Cc: # 5.18+ +Acked-by: Shuah Khan +Signed-off-by: Shuah Khan +Signed-off-by: Greg Kroah-Hartman +--- + tools/testing/selftests/sync/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/tools/testing/selftests/sync/Makefile ++++ b/tools/testing/selftests/sync/Makefile +@@ -1,6 +1,6 @@ + # SPDX-License-Identifier: GPL-2.0 + CFLAGS += -O2 -g -std=gnu89 -pthread -Wall -Wextra +-CFLAGS += -I../../../../usr/include/ ++CFLAGS += $(KHDR_INCLUDES) + LDFLAGS += -pthread + + .PHONY: all clean diff --git a/queue-6.1/selftests-user_events-fix-incorrect-kernel-headers-search-path.patch b/queue-6.1/selftests-user_events-fix-incorrect-kernel-headers-search-path.patch new file mode 100644 index 00000000000..220113fadc1 --- /dev/null +++ b/queue-6.1/selftests-user_events-fix-incorrect-kernel-headers-search-path.patch @@ -0,0 +1,34 @@ +From f3886fd28987c119a98493f625cb9940b5f1c9a0 Mon Sep 17 00:00:00 2001 +From: Mathieu Desnoyers +Date: Fri, 27 Jan 2023 08:57:48 -0500 +Subject: selftests: user_events: Fix incorrect kernel headers search path + +From: Mathieu Desnoyers + +commit f3886fd28987c119a98493f625cb9940b5f1c9a0 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 +Cc: Shuah Khan +Cc: linux-kselftest@vger.kernel.org +Cc: Ingo Molnar +Cc: # 5.18+ +Signed-off-by: Shuah Khan +Signed-off-by: Greg Kroah-Hartman +--- + tools/testing/selftests/user_events/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/tools/testing/selftests/user_events/Makefile ++++ b/tools/testing/selftests/user_events/Makefile +@@ -1,5 +1,5 @@ + # SPDX-License-Identifier: GPL-2.0 +-CFLAGS += -Wl,-no-as-needed -Wall -I../../../../usr/include ++CFLAGS += -Wl,-no-as-needed -Wall $(KHDR_INCLUDES) + LDLIBS += -lrt -lpthread -lm + + TEST_GEN_PROGS = ftrace_test dyn_test perf_test diff --git a/queue-6.1/selftests-vm-fix-incorrect-kernel-headers-search-path.patch b/queue-6.1/selftests-vm-fix-incorrect-kernel-headers-search-path.patch new file mode 100644 index 00000000000..4a308ee8efc --- /dev/null +++ b/queue-6.1/selftests-vm-fix-incorrect-kernel-headers-search-path.patch @@ -0,0 +1,36 @@ +From 8eb3751c73bec746f61fb6bada60d1074d92b8c3 Mon Sep 17 00:00:00 2001 +From: Mathieu Desnoyers +Date: Fri, 27 Jan 2023 08:57:49 -0500 +Subject: selftests: vm: Fix incorrect kernel headers search path + +From: Mathieu Desnoyers + +commit 8eb3751c73bec746f61fb6bada60d1074d92b8c3 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 +Cc: Shuah Khan +Cc: linux-kselftest@vger.kernel.org +Cc: Ingo Molnar +Cc: # 5.18+ +Signed-off-by: Shuah Khan +Signed-off-by: Greg Kroah-Hartman +--- + tools/testing/selftests/vm/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/tools/testing/selftests/vm/Makefile ++++ b/tools/testing/selftests/vm/Makefile +@@ -23,7 +23,7 @@ MACHINE ?= $(shell echo $(uname_M) | sed + # LDLIBS. + MAKEFLAGS += --no-builtin-rules + +-CFLAGS = -Wall -I $(top_srcdir) -I $(top_srcdir)/usr/include $(EXTRA_CFLAGS) $(KHDR_INCLUDES) ++CFLAGS = -Wall -I $(top_srcdir) $(EXTRA_CFLAGS) $(KHDR_INCLUDES) + LDLIBS = -lrt -lpthread + TEST_GEN_FILES = compaction_test + TEST_GEN_FILES += gup_test diff --git a/queue-6.1/series b/queue-6.1/series index 0f80f2c231e..98f9157c212 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -750,3 +750,25 @@ selftests-powerpc-fix-incorrect-kernel-headers-search-path.patch selftests-ftrace-fix-eprobe-syntax-test-case-to-check-filter-support.patch selftests-sched-fix-incorrect-kernel-headers-search-path.patch selftests-core-fix-incorrect-kernel-headers-search-path.patch +selftests-pid_namespace-fix-incorrect-kernel-headers-search-path.patch +selftests-arm64-fix-incorrect-kernel-headers-search-path.patch +selftests-clone3-fix-incorrect-kernel-headers-search-path.patch +selftests-pidfd-fix-incorrect-kernel-headers-search-path.patch +selftests-membarrier-fix-incorrect-kernel-headers-search-path.patch +selftests-kcmp-fix-incorrect-kernel-headers-search-path.patch +selftests-media_tests-fix-incorrect-kernel-headers-search-path.patch +selftests-gpio-fix-incorrect-kernel-headers-search-path.patch +selftests-filesystems-fix-incorrect-kernel-headers-search-path.patch +selftests-user_events-fix-incorrect-kernel-headers-search-path.patch +selftests-ptp-fix-incorrect-kernel-headers-search-path.patch +selftests-sync-fix-incorrect-kernel-headers-search-path.patch +selftests-rseq-fix-incorrect-kernel-headers-search-path.patch +selftests-move_mount_set_group-fix-incorrect-kernel-headers-search-path.patch +selftests-mount_setattr-fix-incorrect-kernel-headers-search-path.patch +selftests-perf_events-fix-incorrect-kernel-headers-search-path.patch +selftests-ipc-fix-incorrect-kernel-headers-search-path.patch +selftests-futex-fix-incorrect-kernel-headers-search-path.patch +selftests-drivers-fix-incorrect-kernel-headers-search-path.patch +selftests-dmabuf-heaps-fix-incorrect-kernel-headers-search-path.patch +selftests-vm-fix-incorrect-kernel-headers-search-path.patch +selftests-seccomp-fix-incorrect-kernel-headers-search-path.patch -- 2.47.3