diff --git a/arch/arm64/configs/vendor/genericarmv8-64_defconfig b/arch/arm64/configs/vendor/genericarmv8-64_defconfig
index 92d6bef59fbd..2ea485acb6b8 100644
--- a/arch/arm64/configs/vendor/genericarmv8-64_defconfig
+++ b/arch/arm64/configs/vendor/genericarmv8-64_defconfig
@@ -353,15 +353,13 @@ CONFIG_CMA_SIZE_MBYTES=8
 CONFIG_PRINTK_TIME=y
 CONFIG_DYNAMIC_DEBUG=y
 CONFIG_DEBUG_INFO=y
+CONFIG_DEBUG_FS=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_KERNEL=y
 # CONFIG_SCHED_DEBUG is not set
 # CONFIG_DEBUG_PREEMPT is not set
+CONFIG_STACKTRACE=y
 CONFIG_DEBUG_CREDENTIALS=y
-CONFIG_FUNCTION_TRACER=y
-CONFIG_PREEMPTIRQ_EVENTS=y
-CONFIG_IRQSOFF_TRACER=y
-CONFIG_PREEMPT_TRACER=y
-CONFIG_SCHED_TRACER=y
+# CONFIG_FTRACE is not set
 CONFIG_MEMTEST=y
 CONFIG_BUG_ON_DATA_CORRUPTION=y