8 files changed, 11 insertions, 4 deletions

diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 5dc9273781d6..a30856058742 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -10,6 +10,7 @@ config ARM64
         select GENERIC_TIME_VSYSCALL
         select HARDIRQS_SW_RESEND
         select HAVE_ARCH_TRACEHOOK
+        select HAVE_DEBUG_BUGVERBOSE
         select HAVE_DEBUG_KMEMLEAK
         select HAVE_DMA_API_DEBUG
         select HAVE_DMA_ATTRS
diff --git a/arch/frv/Kconfig b/arch/frv/Kconfig
index cc5709d18350..9d262645f667 100644
--- a/arch/frv/Kconfig
+++ b/arch/frv/Kconfig
@@ -8,6 +8,7 @@ config FRV
         select HAVE_UID16
         select HAVE_GENERIC_HARDIRQS
         select GENERIC_IRQ_SHOW
+        select HAVE_DEBUG_BUGVERBOSE
         select ARCH_HAVE_NMI_SAFE_CMPXCHG
         select GENERIC_CPU_DEVICES
         select ARCH_WANT_IPC_PARSE_VERSION
diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig
index 49498bbb9616..e875fc3ce9cb 100644
--- a/arch/m32r/Kconfig
+++ b/arch/m32r/Kconfig
@@ -8,6 +8,7 @@ config M32R
         select HAVE_KERNEL_BZIP2
         select HAVE_KERNEL_LZMA
         select ARCH_WANT_IPC_PARSE_VERSION
+        select HAVE_DEBUG_BUGVERBOSE
         select HAVE_GENERIC_HARDIRQS
         select GENERIC_IRQ_PROBE
         select GENERIC_IRQ_SHOW
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index 3e2b2f66db60..dae1e7e16a37 100644
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -3,6 +3,7 @@ config M68K
         default y
         select HAVE_IDE
         select HAVE_AOUT if MMU
+        select HAVE_DEBUG_BUGVERBOSE
         select HAVE_GENERIC_HARDIRQS
         select GENERIC_IRQ_SHOW
         select GENERIC_ATOMIC64
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index cfbf3e3c982b..3b3e27a3ff2c 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -13,6 +13,7 @@ config SUPERH
         select HAVE_DMA_ATTRS
         select HAVE_IRQ_WORK
         select HAVE_PERF_EVENTS
+        select HAVE_DEBUG_BUGVERBOSE
         select ARCH_HAVE_CUSTOM_GPIO_H
         select ARCH_HAVE_NMI_SAFE_CMPXCHG if (GUSA_RB || CPU_SH4A)
         select PERF_USE_VMALLOC
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 274d6cf0ada2..700a01adec3a 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -32,6 +32,7 @@ config SPARC
         select GENERIC_PCI_IOMAP
         select HAVE_NMI_WATCHDOG if SPARC64
         select HAVE_BPF_JIT
+        select HAVE_DEBUG_BUGVERBOSE
         select GENERIC_SMP_IDLE_THREAD
         select GENERIC_CMOS_UPDATE
         select GENERIC_CLOCKEVENTS
diff --git a/arch/tile/Kconfig b/arch/tile/Kconfig
index 9a0d77d3ba14..df69d4296b4b 100644
--- a/arch/tile/Kconfig
+++ b/arch/tile/Kconfig
@@ -14,6 +14,7 @@ config TILE
         select GENERIC_IRQ_PROBE
         select GENERIC_PENDING_IRQ if SMP
         select GENERIC_IRQ_SHOW
+        select HAVE_DEBUG_BUGVERBOSE
         select HAVE_SYSCALL_WRAPPERS if TILEGX
         select SYS_HYPERVISOR
         select ARCH_HAVE_NMI_SAFE_CMPXCHG
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 736db3990506..b7281e4d1473 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -751,12 +751,12 @@ config DEBUG_HIGHMEM
           This options enables addition error checking for high memory systems.
           Disable for production systems.
 
+config HAVE_DEBUG_BUGVERBOSE
+        bool
+
 config DEBUG_BUGVERBOSE
         bool "Verbose BUG() reporting (adds 70K)" if DEBUG_KERNEL && EXPERT
-        depends on BUG
-        depends on ARM || AVR32 || M32R || M68K || SPARC32 || SPARC64 || \
-                   FRV || SUPERH || GENERIC_BUG || BLACKFIN || MN10300 || \
-                   TILE || ARM64
+        depends on BUG && (GENERIC_BUG || HAVE_DEBUG_BUGVERBOSE)
         default y
         help
           Say Y here to make BUG() panics output the file name and line number