sys-kernel/coreos-sources: update revert pahole flags patch

This commit is contained in:
Adrian Vladu 2024-08-16 16:28:22 +00:00 committed by Mathieu Tortuyaux
parent 5e91b5ea67
commit d60f4b220c
No known key found for this signature in database
GPG Key ID: AC5CCFB52545D9B8

View File

@ -1,18 +1,18 @@
diff --git a/init/Kconfig b/init/Kconfig diff --git a/init/Kconfig b/init/Kconfig
index 6d35728b94b2..9ae94bf60971 100644 index e173364abd6c..cdc35682e03b 100644
--- a/init/Kconfig --- a/init/Kconfig
+++ b/init/Kconfig +++ b/init/Kconfig
@@ -1888,7 +1888,7 @@ config RUST @@ -1899,7 +1899,7 @@ config RUST
depends on !MODVERSIONS
depends on !GCC_PLUGINS depends on !GCC_PLUGINS
depends on !RANDSTRUCT depends on !RANDSTRUCT
depends on !SHADOW_CALL_STACK
- depends on !DEBUG_INFO_BTF || PAHOLE_HAS_LANG_EXCLUDE - depends on !DEBUG_INFO_BTF || PAHOLE_HAS_LANG_EXCLUDE
+ depends on !DEBUG_INFO_BTF + depends on !DEBUG_INFO_BTF
help help
Enables Rust support in the kernel. Enables Rust support in the kernel.
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index fa307f93fa2e..f18386d4712f 100644 index da5513cfc125..f2b3aab6d4a1 100644
--- a/lib/Kconfig.debug --- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug +++ b/lib/Kconfig.debug
@@ -394,15 +394,6 @@ config PAHOLE_HAS_BTF_TAG @@ -394,15 +394,6 @@ config PAHOLE_HAS_BTF_TAG
@ -29,8 +29,8 @@ index fa307f93fa2e..f18386d4712f 100644
- using DEBUG_INFO_BTF_MODULES. - using DEBUG_INFO_BTF_MODULES.
- -
config DEBUG_INFO_BTF_MODULES config DEBUG_INFO_BTF_MODULES
def_bool y bool "Generate BTF type information for kernel modules"
depends on DEBUG_INFO_BTF && MODULES && PAHOLE_HAS_SPLIT_BTF default y
diff --git a/scripts/pahole-flags.sh b/scripts/pahole-flags.sh diff --git a/scripts/pahole-flags.sh b/scripts/pahole-flags.sh
index 728d55190d97..c293941612e7 100755 index 728d55190d97..c293941612e7 100755
--- a/scripts/pahole-flags.sh --- a/scripts/pahole-flags.sh