Pull bugfix into test branch

[linux-2.6-omap-h63xx.git] / lib / Kconfig.debug

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 756a908c441d28710e773e15b7b619191f9efdcd..818e4589f71849b3fee3716451b50ef1e655a65e 100644 (file)
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -1,6 +1,7 @@
 
 config PRINTK_TIME
        bool "Show timing information on printks"
 
 config PRINTK_TIME
        bool "Show timing information on printks"

+       depends on PRINTK

        help
          Selecting this option causes timing information to be
          included in printk output.  This allows you to measure
        help
          Selecting this option causes timing information to be
          included in printk output.  This allows you to measure


@@ -46,6 +47,30 @@ config UNUSED_SYMBOLS
          you really need it, and what the merge plan to the mainline kernel for
          your module is.
 
          you really need it, and what the merge plan to the mainline kernel for
          your module is.
 

+config DEBUG_FS
+       bool "Debug Filesystem"
+       depends on SYSFS
+       help
+         debugfs is a virtual file system that kernel developers use to put
+         debugging files into.  Enable this option to be able to read and
+         write to these files.
+
+         If unsure, say N.
+
+config HEADERS_CHECK
+       bool "Run 'make headers_check' when building vmlinux"
+       depends on !UML
+       help
+         This option will extract the user-visible kernel headers whenever
+         building the kernel, and will run basic sanity checks on them to
+         ensure that exported files do not attempt to include files which
+         were not exported, etc.
+
+         If you're making modifications to header files which are
+         relevant for userspace, say 'Y', and check the headers
+         exported to $(INSTALL_HDR_PATH) (usually 'usr/include' in
+         your build tree), to make sure they're suitable.
+

 config DEBUG_KERNEL
        bool "Kernel debugging"
        help
 config DEBUG_KERNEL
        bool "Kernel debugging"
        help


@@ -71,7 +96,7 @@ config LOG_BUF_SHIFT
 
 config DETECT_SOFTLOCKUP
        bool "Detect Soft Lockups"
 
 config DETECT_SOFTLOCKUP
        bool "Detect Soft Lockups"

-       depends on DEBUG_KERNEL
+       depends on DEBUG_KERNEL && !S390

        default y
        help
          Say Y here to enable the kernel to detect "soft lockups",
        default y
        help
          Say Y here to enable the kernel to detect "soft lockups",


@@ -284,7 +309,7 @@ config DEBUG_HIGHMEM
 config DEBUG_BUGVERBOSE
        bool "Verbose BUG() reporting (adds 70K)" if DEBUG_KERNEL && EMBEDDED
        depends on BUG
 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 || X86_32 || FRV || SUPERH
+       depends on ARM || ARM26 || AVR32 || M32R || M68K || SPARC32 || SPARC64 || FRV || SUPERH || GENERIC_BUG

        default !EMBEDDED
        help
          Say Y here to make BUG() panics output the file name and line number
        default !EMBEDDED
        help
          Say Y here to make BUG() panics output the file name and line number


@@ -301,16 +326,6 @@ config DEBUG_INFO
 
          If unsure, say N.
 
 
          If unsure, say N.
 

-config DEBUG_FS
-       bool "Debug Filesystem"
-       depends on SYSFS
-       help
-         debugfs is a virtual file system that kernel developers use to put
-         debugging files into.  Enable this option to be able to read and
-         write to these files.
-
-         If unsure, say N.
-

 config DEBUG_VM
        bool "Debug VM"
        depends on DEBUG_KERNEL
 config DEBUG_VM
        bool "Debug VM"
        depends on DEBUG_KERNEL


@@ -341,7 +356,7 @@ config FRAME_POINTER
 
 config UNWIND_INFO
        bool "Compile the kernel with frame unwind information"
 
 config UNWIND_INFO
        bool "Compile the kernel with frame unwind information"

-       depends on !IA64 && !PARISC
+       depends on !IA64 && !PARISC && !ARM

        depends on !MODULES || !(MIPS || PPC || SUPERH || V850)
        help
          If you say Y here the resulting kernel image will be slightly larger
        depends on !MODULES || !(MIPS || PPC || SUPERH || V850)
        help
          If you say Y here the resulting kernel image will be slightly larger


@@ -387,6 +402,7 @@ config RCU_TORTURE_TEST
 
 config LKDTM
        tristate "Linux Kernel Dump Test Tool Module"
 
 config LKDTM
        tristate "Linux Kernel Dump Test Tool Module"

+       depends on DEBUG_KERNEL

        depends on KPROBES
        default n
        help
        depends on KPROBES
        default n
        help


@@ -398,3 +414,36 @@ config LKDTM
 
        Documentation on how to use the module can be found in
        drivers/misc/lkdtm.c
 
        Documentation on how to use the module can be found in
        drivers/misc/lkdtm.c

+
+config FAULT_INJECTION
+       bool "Fault-injection framework"
+       depends on DEBUG_KERNEL
+       depends on STACKTRACE
+       select FRAME_POINTER
+       help
+         Provide fault-injection framework.
+         For more details, see Documentation/fault-injection/.
+
+config FAILSLAB
+       bool "Fault-injection capability for kmalloc"
+       depends on FAULT_INJECTION
+       help
+         Provide fault-injection capability for kmalloc.
+
+config FAIL_PAGE_ALLOC
+       bool "Fault-injection capabilitiy for alloc_pages()"
+       depends on FAULT_INJECTION
+       help
+         Provide fault-injection capability for alloc_pages().
+
+config FAIL_MAKE_REQUEST
+       bool "Fault-injection capability for disk IO"
+       depends on FAULT_INJECTION
+       help
+         Provide fault-injection capability for disk IO.
+
+config FAULT_INJECTION_DEBUG_FS
+       bool "Debugfs entries for fault-injection capabilities"
+       depends on FAULT_INJECTION && SYSFS && DEBUG_FS
+       help
+         Enable configuration of fault-injection capabilities via debugfs.