diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 4a9ec4b7cd69f..4fbe483851f8b 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -582,21 +582,27 @@ config DEBUG_SPINLOCK
 	  best used in conjunction with the NMI watchdog so that spinlock
 	  deadlocks are also debuggable.
 
-config DEBUG_SPINLOCK_BITE_ON_BUG
-	bool "Cause a Watchdog Bite on Spinlock bug"
-	depends on DEBUG_SPINLOCK && !DEBUG_SPINLOCK_PANIC_ON_BUG && MSM_WATCHDOG_V2
-	help
-	  On a spinlock bug, cause a watchdog bite so that we can get the precise
-	  state of the system captured at the time of spin dump. This is mutually
-	  exclusive with the below DEBUG_SPINLOCK_PANIC_ON_BUG config.
-
-config DEBUG_SPINLOCK_PANIC_ON_BUG
-	bool "Cause a Kernel Panic on Spinlock bug"
-	depends on DEBUG_SPINLOCK && !DEBUG_SPINLOCK_BITE_ON_BUG
-	help
-	  On a spinlock bug, cause a kernel panic so that we can get the complete
-	  information about the system at the time of spin dump in the dmesg.
-	  This is mutually exclusive with the above DEBUG_SPINLOCK_BITE_ON_BUG.
+choice
+	prompt "Perform Action on spinlock bug"
+	depends on DEBUG_SPINLOCK
+
+	default DEBUG_SPINLOCK_BITE_ON_BUG
+
+	config DEBUG_SPINLOCK_BITE_ON_BUG
+		bool "Cause a Watchdog Bite on Spinlock bug"
+		depends on MSM_WATCHDOG_V2
+		help
+		  On a spinlock bug, cause a watchdog bite so that we can get the precise
+		  state of the system captured at the time of spin dump. This is mutually
+		  exclusive with the below DEBUG_SPINLOCK_PANIC_ON_BUG config.
+
+	config DEBUG_SPINLOCK_PANIC_ON_BUG
+		bool "Cause a Kernel Panic on Spinlock bug"
+		help
+		  On a spinlock bug, cause a kernel panic so that we can get the complete
+		  information about the system at the time of spin dump in the dmesg.
+		  This is mutually exclusive with the above DEBUG_SPINLOCK_BITE_ON_BUG.
+endchoice
 
 config DEBUG_MUTEXES
 	bool "Mutex debugging: basic checks"