diff -upN reference/arch/i386/Kconfig.kgdb current/arch/i386/Kconfig.kgdb
--- reference/arch/i386/Kconfig.kgdb
+++ current/arch/i386/Kconfig.kgdb
@@ -1,6 +1,6 @@
 config KGDB
 	bool "Include kgdb kernel debugger"
-	depends on DEBUG_KERNEL
+	depends on DEBUG_KERNEL && !KPROBES
 	help
 	  If you say Y here, the system will be compiled with the debug
 	  option (-g) and a debugging stub will be included in the