7.3-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit 352665c55877368854f87724698dad0b453444eb ] "make O= tools/dma" fails: Makefile:27: /tools/build/Makefile.include: No such file or directory tools/Makefile clears srctree, and the dma Makefile only works it out again when building_out_of_srctree is not set, which the top-level Makefile sets for O= builds. Also work out srctree when it is empty, as tools/bpf/Makefile does since commit a89b2cbf71d64 ("tools, bpf: Fix build for 'make -s tools/bpf O='"). Fixes: f74ee32963f1b ("tools/dma: move dma_map_benchmark from selftests to tools/dma") Cc: stable@vger.kernel.org Assisted-by: LLM Signed-off-by: Sasha Levin Acked-by: Qinxin Xia Link: https://lore.kernel.org/r/20261011223358.2327625-4-sashal@kernel.org Signed-off-by: Marek Szyprowski Signed-off-by: Sasha Levin --- tools/dma/Makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/dma/Makefile b/tools/dma/Makefile index 0c239a6b9eae5..20ae7f09cd206 100644 --- a/tools/dma/Makefile +++ b/tools/dma/Makefile @@ -7,7 +7,13 @@ bindir ?= /usr/bin # isn't set and when invoked from selftests build, where srctree # is set to ".". building_out_of_srctree is undefined for in srctree # builds +ifeq ($(srctree),) +update_srctree := 1 +endif ifndef building_out_of_srctree +update_srctree := 1 +endif +ifeq ($(update_srctree),1) srctree := $(patsubst %/,%,$(dir $(CURDIR))) srctree := $(patsubst %/,%,$(dir $(srctree))) endif -- 2.53.0