diff --git a/arch/arm64/configs/a53x-ksu_defconfig b/arch/arm64/configs/a53x-ksu_defconfig
index eca6d70e9..0c65487cf 100644
--- a/arch/arm64/configs/a53x-ksu_defconfig
+++ b/arch/arm64/configs/a53x-ksu_defconfig
@@ -6109,9 +6109,9 @@ CONFIG_DEBUG_SNAPSHOT=m
 CONFIG_DEBUG_SNAPSHOT_API=y
 CONFIG_DEBUG_SNAPSHOT_FREQ_DOMAIN_NUM=32
 CONFIG_DEBUG_SNAPSHOT_LOG_ITEM_SIZE=1024
-CONFIG_DEBUG_SNAPSHOT_SFRDUMP=m
-CONFIG_DEBUG_SNAPSHOT_QUICKDUMP=m
-CONFIG_DEBUG_SNAPSHOT_DEBUG_KINFO=m
+# CONFIG_DEBUG_SNAPSHOT_SFRDUMP is not set
+# CONFIG_DEBUG_SNAPSHOT_QUICKDUMP is not set
+# CONFIG_DEBUG_SNAPSHOT_DEBUG_KINFO is not set
 # CONFIG_EXYNOS_DEBUG_TEST is not set
 CONFIG_EXYNOS_ITMON=m
 CONFIG_EXYNOS_CORESIGHT=m
diff --git a/arch/arm64/configs/a53x_defconfig b/arch/arm64/configs/a53x_defconfig
index f22042b5e..af06f05a0 100644
--- a/arch/arm64/configs/a53x_defconfig
+++ b/arch/arm64/configs/a53x_defconfig
@@ -6109,9 +6109,9 @@ CONFIG_DEBUG_SNAPSHOT=m
 CONFIG_DEBUG_SNAPSHOT_API=y
 CONFIG_DEBUG_SNAPSHOT_FREQ_DOMAIN_NUM=32
 CONFIG_DEBUG_SNAPSHOT_LOG_ITEM_SIZE=1024
-CONFIG_DEBUG_SNAPSHOT_SFRDUMP=m
-CONFIG_DEBUG_SNAPSHOT_QUICKDUMP=m
-CONFIG_DEBUG_SNAPSHOT_DEBUG_KINFO=m
+# CONFIG_DEBUG_SNAPSHOT_SFRDUMP is not set
+# CONFIG_DEBUG_SNAPSHOT_QUICKDUMP is not set
+# CONFIG_DEBUG_SNAPSHOT_DEBUG_KINFO is not set
 # CONFIG_EXYNOS_DEBUG_TEST is not set
 CONFIG_EXYNOS_ITMON=m
 CONFIG_EXYNOS_CORESIGHT=m
diff --git a/kernel_build/vboot_dlkm/modules.load b/kernel_build/vboot_dlkm/modules.load
index b29e66833..710849bd4 100644
--- a/kernel_build/vboot_dlkm/modules.load
+++ b/kernel_build/vboot_dlkm/modules.load
@@ -21,9 +21,6 @@ clk-exynos-audss.ko
 pl330.ko
 samsung-dma.ko
 dss.ko
-debug-snapshot-debug-kinfo.ko
-debug-snapshot-sfrdump.ko
-debug-snapshot-qd.ko
 exynos-coresight.ko
 exynos-ecc-handler.ko
 hardlockup-watchdog.ko