From: Sasha Levin <sashal@kernel.org>
Date: Sat, 3 Apr 2021 18:56:39 +0000 (-0400)
Subject: Fixes for 5.10
X-Git-Tag: v4.4.265~33
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3cdb8a76c75ceaa2f8f5860c08e1fda3e0c80d73;p=thirdparty%2Fkernel%2Fstable-queue.git

Fixes for 5.10

Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/queue-5.10/kbuild-add-resolve_btfids-clean-to-root-clean-target.patch b/queue-5.10/kbuild-add-resolve_btfids-clean-to-root-clean-target.patch
new file mode 100644
index 00000000000..f4bb3f26f96
--- /dev/null
+++ b/queue-5.10/kbuild-add-resolve_btfids-clean-to-root-clean-target.patch
@@ -0,0 +1,52 @@
+From 9acf956f7d0fd02e5f83ad1d1b997e3902932a1d Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Fri, 5 Feb 2021 13:40:20 +0100
+Subject: kbuild: Add resolve_btfids clean to root clean target
+
+From: Jiri Olsa <jolsa@kernel.org>
+
+[ Upstream commit 50d3a3f81689586697a38cd60070181ebe626ad9 ]
+
+The resolve_btfids tool is used during the kernel build,
+so we should clean it on kernel's make clean.
+
+Invoking the the resolve_btfids clean as part of root
+'make clean'.
+
+Signed-off-by: Jiri Olsa <jolsa@kernel.org>
+Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
+Acked-by: Song Liu <songliubraving@fb.com>
+Link: https://lore.kernel.org/bpf/20210205124020.683286-5-jolsa@kernel.org
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ Makefile | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 4801cc25e347..98d64592496a 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1083,6 +1083,11 @@ ifdef CONFIG_STACK_VALIDATION
+   endif
+ endif
+ 
++PHONY += resolve_btfids_clean
++
++resolve_btfids_clean:
++	$(Q)$(MAKE) -sC $(srctree)/tools/bpf/resolve_btfids O=$(abspath $(objtree))/tools/bpf/resolve_btfids clean
++
+ ifdef CONFIG_BPF
+ ifdef CONFIG_DEBUG_INFO_BTF
+   ifeq ($(has_libelf),1)
+@@ -1500,7 +1505,7 @@ vmlinuxclean:
+ 	$(Q)$(CONFIG_SHELL) $(srctree)/scripts/link-vmlinux.sh clean
+ 	$(Q)$(if $(ARCH_POSTLINK), $(MAKE) -f $(ARCH_POSTLINK) clean)
+ 
+-clean: archclean vmlinuxclean
++clean: archclean vmlinuxclean resolve_btfids_clean
+ 
+ # mrproper - Delete all generated files, including .config
+ #
+-- 
+2.30.2
+
diff --git a/queue-5.10/series b/queue-5.10/series
index 6be166bdb31..f8ecd4f8b80 100644
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -96,3 +96,4 @@ kvm-x86-mmu-factor-out-functions-to-add-remove-tdp-m.patch
 kvm-x86-mmu-use-atomic-ops-to-set-sptes-in-tdp-mmu-m.patch
 kvm-x86-compile-out-tdp-mmu-on-32-bit-systems.patch
 kvm-x86-mmu-ensure-tlbs-are-flushed-for-tdp-mmu-duri.patch
+kbuild-add-resolve_btfids-clean-to-root-clean-target.patch