[SRU][F/hwe-5.13][PATCH] UBUNTU: [Config] Re-enable CONFIG_DEBUG_INFO_BTF on all arches

[Dimitri John Ledkov]

New backport of pahole is now available that works with new enough
kernels and on 32-bit arches, thus it is now possible to re-enable
CONFIG_DEBUG_INFO_BTF on all arches.

BugLink: https://bugs.launchpad.net/bugs/1945632
Signed-off-by: Dimitri John Ledkov <dimitri.ledkov at canonical.com>
---
 debian.hwe-5.13/config/config.common.ubuntu  | 5 +++--
 debian.hwe-5.13/scripts/helpers/local-mangle | 8 --------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/debian.hwe-5.13/config/config.common.ubuntu b/debian.hwe-5.13/config/config.common.ubuntu
index 02910c4748..d386d546b6 100644
--- a/debian.hwe-5.13/config/config.common.ubuntu
+++ b/debian.hwe-5.13/config/config.common.ubuntu
@@ -2551,10 +2551,10 @@ CONFIG_DEBUG_FS_ALLOW_ALL=y
 # CONFIG_DEBUG_HIGHMEM is not set
 # CONFIG_DEBUG_HOTPLUG_CPU0 is not set
 CONFIG_DEBUG_INFO=y
-# CONFIG_DEBUG_INFO_BTF is not set
+CONFIG_DEBUG_INFO_BTF=y
+CONFIG_DEBUG_INFO_BTF_MODULES=y
 # CONFIG_DEBUG_INFO_COMPRESSED is not set
 CONFIG_DEBUG_INFO_DWARF4=y
-# CONFIG_DEBUG_INFO_DWARF5 is not set
 # CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set
 # CONFIG_DEBUG_INFO_REDUCED is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
@@ -7385,6 +7385,7 @@ CONFIG_PAGE_POISONING=y
 CONFIG_PAGE_POOL=y
 CONFIG_PAGE_REPORTING=y
 CONFIG_PAGE_TABLE_ISOLATION=y
+CONFIG_PAHOLE_HAS_SPLIT_BTF=y
 CONFIG_PALMAS_GPADC=m
 CONFIG_PANASONIC_LAPTOP=m
 CONFIG_PANEL=m
diff --git a/debian.hwe-5.13/scripts/helpers/local-mangle b/debian.hwe-5.13/scripts/helpers/local-mangle
index 0beb30bb37..cab1384168 100755
--- a/debian.hwe-5.13/scripts/helpers/local-mangle
+++ b/debian.hwe-5.13/scripts/helpers/local-mangle
@@ -21,14 +21,6 @@ sed -i "s/CONFIG_SECURITY_DMESG_RESTRICT                  policy<{'amd64': 'y',
 # annotations file as well for all arches.
 sed -i "s/CONFIG_KCSAN                                    policy<{'amd64': 'n', 'arm64': '-', 'armhf': '-', 'ppc64el': '-', 's390x': '-'}>/CONFIG_KCSAN                                    policy<{'amd64': '-', 'arm64': '-', 'armhf': '-', 'ppc64el': '-', 's390x': '-'}>/" ${DEBIAN}/config/annotations
 
-# Disable DEBUG_INFO_BTF (pahole version is too old in focal)
-sed -i "/CONFIG_DEBUG_INFO_BTF/d" ${DEBIAN}/config/annotations
-sed -i 's/CONFIG_DEBUG_INFO_BTF=y/# CONFIG_DEBUG_INFO_BTF is not set/' ${DEBIAN}/config/amd64/config.common.amd64
-sed -i 's/CONFIG_DEBUG_INFO_BTF=y/# CONFIG_DEBUG_INFO_BTF is not set/' ${DEBIAN}/config/arm64/config.common.arm64
-sed -i 's/CONFIG_DEBUG_INFO_BTF=y/# CONFIG_DEBUG_INFO_BTF is not set/' ${DEBIAN}/config/armhf/config.common.armhf
-sed -i 's/CONFIG_DEBUG_INFO_BTF=y/# CONFIG_DEBUG_INFO_BTF is not set/' ${DEBIAN}/config/ppc64el/config.common.ppc64el
-sed -i 's/CONFIG_DEBUG_INFO_BTF=y/# CONFIG_DEBUG_INFO_BTF is not set/' ${DEBIAN}/config/s390x/config.common.s390x
-
 # Drop CONFIG_DEBUG_INFO_DWARF5 because we have a toolchain too old to support
 # this in focal.
 sed -i "/CONFIG_DEBUG_INFO_DWARF5/d" ${DEBIAN}/config/annotations
-- 
2.30.2