1 files changed, 59 insertions, 25 deletions

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index b75fed737f25..0701ddda1df8 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -47,6 +47,30 @@ config UNUSED_SYMBOLS
           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
@@ -285,7 +309,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 || 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
@@ -302,16 +326,6 @@ config DEBUG_INFO
 
           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
@@ -372,20 +386,6 @@ config FORCED_INLINING
           become the default in the future, until then this option is there to
           test gcc for this.
 
-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 RCU_TORTURE_TEST
         tristate "torture tests for RCU"
         depends on DEBUG_KERNEL
@@ -402,6 +402,7 @@ config RCU_TORTURE_TEST
 
 config LKDTM
         tristate "Linux Kernel Dump Test Tool Module"
+        depends on DEBUG_KERNEL
         depends on KPROBES
         default n
         help
@@ -413,3 +414,36 @@ config LKDTM
 
         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 capabilitiy 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.