From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: stable@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
patches@lists.linux.dev,
Mathieu Desnoyers <mathieu.desnoyers@efficios.com>,
Shuah Khan <shuah@kernel.org>,
linux-kselftest@vger.kernel.org, Ingo Molnar <mingo@redhat.com>,
Shuah Khan <skhan@linuxfoundation.org>
Subject: [PATCH 6.2 0876/1001] selftests: drivers: Fix incorrect kernel headers search path
Date: Tue, 7 Mar 2023 18:00:48 +0100 [thread overview]
Message-ID: <20230307170059.913722189@linuxfoundation.org> (raw)
In-Reply-To: <20230307170022.094103862@linuxfoundation.org>
From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
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 <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>
---
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
next prev parent reply other threads:[~2023-03-07 17:57 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20230307170022.094103862@linuxfoundation.org>
2023-03-07 17:00 ` [PATCH 6.2 0835/1001] selftests: x86: Fix incorrect kernel headers search path Greg Kroah-Hartman
2023-03-07 17:00 ` [PATCH 6.2 0856/1001] selftests: sched: " Greg Kroah-Hartman
2023-03-07 17:00 ` [PATCH 6.2 0857/1001] selftests: core: " Greg Kroah-Hartman
2023-03-07 17:00 ` [PATCH 6.2 0858/1001] selftests: pid_namespace: " Greg Kroah-Hartman
2023-03-07 17:00 ` [PATCH 6.2 0859/1001] selftests: arm64: " Greg Kroah-Hartman
2023-03-07 17:00 ` [PATCH 6.2 0860/1001] selftests: clone3: " Greg Kroah-Hartman
2023-03-07 17:00 ` [PATCH 6.2 0861/1001] selftests: pidfd: " Greg Kroah-Hartman
2023-03-07 17:00 ` [PATCH 6.2 0862/1001] selftests: membarrier: " Greg Kroah-Hartman
2023-03-07 17:00 ` [PATCH 6.2 0863/1001] selftests: kcmp: " Greg Kroah-Hartman
2023-03-07 17:00 ` [PATCH 6.2 0864/1001] selftests: media_tests: " Greg Kroah-Hartman
2023-03-07 17:00 ` [PATCH 6.2 0865/1001] selftests: gpio: " Greg Kroah-Hartman
2023-03-07 17:00 ` [PATCH 6.2 0866/1001] selftests: filesystems: " Greg Kroah-Hartman
2023-03-07 17:00 ` [PATCH 6.2 0867/1001] selftests: user_events: " Greg Kroah-Hartman
2023-03-07 17:00 ` [PATCH 6.2 0868/1001] selftests: ptp: " Greg Kroah-Hartman
2023-03-07 17:00 ` [PATCH 6.2 0869/1001] selftests: sync: " Greg Kroah-Hartman
2023-03-07 17:00 ` [PATCH 6.2 0870/1001] selftests: rseq: " Greg Kroah-Hartman
2023-03-07 17:00 ` [PATCH 6.2 0871/1001] selftests: move_mount_set_group: " Greg Kroah-Hartman
2023-03-07 17:00 ` [PATCH 6.2 0872/1001] selftests: mount_setattr: " Greg Kroah-Hartman
2023-03-07 17:00 ` [PATCH 6.2 0873/1001] selftests: perf_events: " Greg Kroah-Hartman
2023-03-07 17:00 ` [PATCH 6.2 0874/1001] selftests: ipc: " Greg Kroah-Hartman
2023-03-07 17:00 ` [PATCH 6.2 0875/1001] selftests: futex: " Greg Kroah-Hartman
2023-03-07 17:00 ` Greg Kroah-Hartman [this message]
2023-03-07 17:00 ` [PATCH 6.2 0877/1001] selftests: dmabuf-heaps: " Greg Kroah-Hartman
2023-03-07 17:00 ` [PATCH 6.2 0878/1001] selftests: vm: " Greg Kroah-Hartman
2023-03-07 17:00 ` [PATCH 6.2 0879/1001] selftests: seccomp: " Greg Kroah-Hartman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230307170059.913722189@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=mathieu.desnoyers@efficios.com \
--cc=mingo@redhat.com \
--cc=patches@lists.linux.dev \
--cc=shuah@kernel.org \
--cc=skhan@linuxfoundation.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox