diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig
index ce23106e56e5..11c098e5c44c 100644
--- a/arch/arm64/configs/gki_defconfig
+++ b/arch/arm64/configs/gki_defconfig
@@ -559,7 +559,6 @@ CONFIG_POWERCAP=y
 CONFIG_ANDROID_BINDER_IPC=y
 CONFIG_ANDROID_BINDERFS=y
 CONFIG_ANDROID_VENDOR_HOOKS=y
-CONFIG_ANDROID_DEBUG_KINFO=y
 CONFIG_LIBNVDIMM=y
 CONFIG_INTERCONNECT=y
 CONFIG_EXT4_FS=y
diff --git a/arch/riscv/configs/gki_defconfig b/arch/riscv/configs/gki_defconfig
index a550a7ae9424..8b4f720b34e4 100644
--- a/arch/riscv/configs/gki_defconfig
+++ b/arch/riscv/configs/gki_defconfig
@@ -509,7 +509,6 @@ CONFIG_POWERCAP=y
 CONFIG_ANDROID_BINDER_IPC=y
 CONFIG_ANDROID_BINDERFS=y
 CONFIG_ANDROID_VENDOR_HOOKS=y
-CONFIG_ANDROID_DEBUG_KINFO=y
 CONFIG_LIBNVDIMM=y
 CONFIG_INTERCONNECT=y
 CONFIG_EXT4_FS=y
diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig
index 9415b4971f63..4c61a6a1c946 100644
--- a/arch/x86/configs/gki_defconfig
+++ b/arch/x86/configs/gki_defconfig
@@ -512,7 +512,6 @@ CONFIG_POWERCAP=y
 CONFIG_ANDROID_BINDER_IPC=y
 CONFIG_ANDROID_BINDERFS=y
 CONFIG_ANDROID_VENDOR_HOOKS=y
-CONFIG_ANDROID_DEBUG_KINFO=y
 CONFIG_LIBNVDIMM=y
 CONFIG_INTERCONNECT=y
 CONFIG_EXT4_FS=y
diff --git a/drivers/android/Kconfig b/drivers/android/Kconfig
index c5e063b723dd..2c110db58cef 100644
--- a/drivers/android/Kconfig
+++ b/drivers/android/Kconfig
@@ -59,6 +59,7 @@ config ANDROID_VENDOR_HOOKS
 config ANDROID_DEBUG_KINFO
 	bool "Android Debug Kernel Information Support"
 	depends on KALLSYMS
+	depends on BROKEN
 	help
 	  This supports kernel information backup for bootloader usage.
 	  Specifics: