1 files changed, 15 insertions, 19 deletions

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 79afd00bbe5f..ee05b8a061b5 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -86,23 +86,6 @@ config DEBUG_SHIRQ
           Drivers ought to be able to handle interrupts coming in at those
           points; some don't and need to be caught.
 
-config LOG_BUF_SHIFT
-        int "Kernel log buffer size (16 => 64KB, 17 => 128KB)" if DEBUG_KERNEL
-        range 12 21
-        default 17 if S390 || LOCKDEP
-        default 16 if X86_NUMAQ || IA64
-        default 15 if SMP
-        default 14
-        help
-          Select kernel log buffer size as a power of 2.
-          Defaults and Examples:
-                     17 => 128 KB for S/390
-                     16 => 64 KB for x86 NUMAQ or IA-64
-                     15 => 32 KB for SMP
-                     14 => 16 KB for uniprocessor
-                     13 =>  8 KB
-                     12 =>  4 KB
-
 config DETECT_SOFTLOCKUP
         bool "Detect Soft Lockups"
         depends on DEBUG_KERNEL && !S390
@@ -201,6 +184,16 @@ config DEBUG_MUTEXES
          This feature allows mutex semantics violations to be detected and
          reported.
 
+config DEBUG_SEMAPHORE
+        bool "Semaphore debugging"
+        depends on DEBUG_KERNEL
+        depends on ALPHA || FRV
+        default n
+        help
+          If you say Y here then semaphore processing will issue lots of
+          verbose debugging messages.  If you suspect a semaphore problem or a
+          kernel hacker asks for this option then say Y.  Otherwise say N.
+
 config DEBUG_LOCK_ALLOC
         bool "Lock debugging: detect incorrect freeing of live locks"
         depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
@@ -320,7 +313,7 @@ config DEBUG_HIGHMEM
 config DEBUG_BUGVERBOSE
         bool "Verbose BUG() reporting (adds 70K)" if DEBUG_KERNEL && EMBEDDED
         depends on BUG
-        depends on ARM || ARM26 || AVR32 || M32R || M68K || SPARC32 || SPARC64 || FRV || SUPERH || GENERIC_BUG
+        depends on ARM || ARM26 || AVR32 || M32R || M68K || SPARC32 || SPARC64 || FRV || SUPERH || GENERIC_BUG || BFIN
         default !EMBEDDED
         help
           Say Y here to make BUG() panics output the file name and line number
@@ -333,6 +326,9 @@ config DEBUG_INFO
         help
           If you say Y here the resulting kernel image will include
           debugging info resulting in a larger kernel image.
+          This adds debug symbols to the kernel and modules (gcc -g), and
+          is needed if you intend to use kernel crashdump or binary object
+          tools like crash, kgdb, LKCD, gdb, etc on the kernel.
           Say Y here only if you plan to debug the kernel.
 
           If unsure, say N.
@@ -357,7 +353,7 @@ config DEBUG_LIST
 
 config FRAME_POINTER
         bool "Compile the kernel with frame pointers"
-        depends on DEBUG_KERNEL && (X86 || CRIS || M68K || M68KNOMMU || FRV || UML || S390 || AVR32 || SUPERH)
+        depends on DEBUG_KERNEL && (X86 || CRIS || M68K || M68KNOMMU || FRV || UML || S390 || AVR32 || SUPERH || BFIN)
         default y if DEBUG_INFO && UML
         help
           If you say Y here the resulting kernel image will be slightly larger