Add patch to fix build with newer pahole
Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
This commit is contained in:
parent
6f4aee58e9
commit
4a4272735f
|
@ -3395,3 +3395,48 @@ index 8b62654ff3f9..1c03d1cff35c 100644
|
|||
#ifdef CONFIG_PERF_EVENTS
|
||||
int security_perf_event_open(struct perf_event_attr *attr, int type)
|
||||
{
|
||||
From 9d5fb7eaaa7db6a9952531d029dc9c3fb16a8eee Mon Sep 17 00:00:00 2001
|
||||
From: Martin Rodriguez Reboredo <yakoyoku@gmail.com>
|
||||
Date: Tue, 6 Sep 2022 15:31:23 +0200
|
||||
Subject: [PATCH] kbuild: Add skip_encoding_btf_enum64 option to pahole
|
||||
|
||||
New pahole (version 1.24) generates by default new BTF_KIND_ENUM64 BTF tag,
|
||||
which is not supported by stable kernel.
|
||||
|
||||
As a result the kernel with CONFIG_DEBUG_INFO_BTF option will fail to
|
||||
compile with following error:
|
||||
|
||||
BTFIDS vmlinux
|
||||
FAILED: load BTF from vmlinux: Invalid argument
|
||||
|
||||
New pahole provides --skip_encoding_btf_enum64 option to skip BTF_KIND_ENUM64
|
||||
generation and produce BTF supported by stable kernel.
|
||||
|
||||
Adding this option to scripts/pahole-flags.sh.
|
||||
|
||||
This change does not have equivalent commit in linus tree, because linus tree
|
||||
has support for BTF_KIND_ENUM64 tag, so it does not need to be disabled.
|
||||
|
||||
Signed-off-by: Martin Rodriguez Reboredo <yakoyoku@gmail.com>
|
||||
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
|
||||
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||||
---
|
||||
scripts/pahole-flags.sh | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/scripts/pahole-flags.sh b/scripts/pahole-flags.sh
|
||||
index 0d99ef17e4a5..d4f3d63cb434 100755
|
||||
--- a/scripts/pahole-flags.sh
|
||||
+++ b/scripts/pahole-flags.sh
|
||||
@@ -20,4 +20,8 @@ if [ "${pahole_ver}" -ge "122" ]; then
|
||||
extra_paholeopt="${extra_paholeopt} -j"
|
||||
fi
|
||||
|
||||
+if [ "${pahole_ver}" -ge "124" ]; then
|
||||
+ extra_paholeopt="${extra_paholeopt} --skip_encoding_btf_enum64"
|
||||
+fi
|
||||
+
|
||||
echo ${extra_paholeopt}
|
||||
--
|
||||
2.37.3
|
||||
|
||||
|
|
Loading…
Reference in New Issue