diff --git a/Makefile b/Makefile
index fa89f8cbd674..049bb5560d5d 100755
--- a/Makefile
+++ b/Makefile
@@ -789,13 +789,13 @@ KBUILD_CFLAGS += $(call cc-disable-warning, tautological-compare)
 # See modpost pattern 2
 KBUILD_CFLAGS += $(call cc-option, -mno-global-merge,)
 KBUILD_CFLAGS += $(call cc-option, -fcatch-undefined-behavior)
-endif
+else
 
 KBUILD_CFLAGS += $(call cc-option,-fno-delete-null-pointer-checks,)
 # These warnings generated too much noise in a regular build.
 # Use make W=1 to enable them (see scripts/Makefile.extrawarn)
 KBUILD_CFLAGS += $(call cc-disable-warning, unused-but-set-variable)
-
+endif
 
 ifeq ($(ld-name),lld)
 LDFLAGS += -O2
diff --git a/arch/arm64/configs/vendor/lineage-a52q_defconfig b/arch/arm64/configs/vendor/lineage-a52q_defconfig
index f3aefa241040..352beec99b62 100755
--- a/arch/arm64/configs/vendor/lineage-a52q_defconfig
+++ b/arch/arm64/configs/vendor/lineage-a52q_defconfig
@@ -6154,7 +6154,7 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 #
 # Compile-time checks and compiler options
 #
-# CONFIG_DEBUG_INFO is not set
+CONFIG_DEBUG_INFO=y
 # CONFIG_DEBUG_INFO_REDUCED is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
 # CONFIG_DEBUG_INFO_DWARF4 is not set
diff --git a/arch/arm64/configs/vendor/lineage-a72q_defconfig b/arch/arm64/configs/vendor/lineage-a72q_defconfig
index 78ee21dc8ac3..c24410020e9d 100644
--- a/arch/arm64/configs/vendor/lineage-a72q_defconfig
+++ b/arch/arm64/configs/vendor/lineage-a72q_defconfig
@@ -6151,7 +6151,7 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 #
 # Compile-time checks and compiler options
 #
-# CONFIG_DEBUG_INFO is not set
+CONFIG_DEBUG_INFO=y
 # CONFIG_DEBUG_INFO_REDUCED is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
 # CONFIG_DEBUG_INFO_DWARF4 is not set