Merge tag 's390-6.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

[linux-block.git] / lib / Kconfig.debug

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 39d1d93164bd094e72f88e2db9ce2a0d854abb17..ce51d4dc6803ede3cc16008ef0eeec481c40c2be 100644 (file)
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -502,7 +502,7 @@ config SECTION_MISMATCH_WARN_ONLY
 
 config DEBUG_FORCE_FUNCTION_ALIGN_64B
        bool "Force all function address 64B aligned"
-       depends on EXPERT && (X86_64 || ARM64 || PPC32 || PPC64 || ARC)
+       depends on EXPERT && (X86_64 || ARM64 || PPC32 || PPC64 || ARC || S390)
        select FUNCTION_ALIGNMENT_64B
        help
          There are cases that a commit from one domain changes the function
@@ -791,6 +791,16 @@ config DEBUG_VM
 
          If unsure, say N.
 
+config DEBUG_VM_SHOOT_LAZIES
+       bool "Debug MMU_LAZY_TLB_SHOOTDOWN implementation"
+       depends on DEBUG_VM
+       depends on MMU_LAZY_TLB_SHOOTDOWN
+       help
+         Enable additional IPIs that ensure lazy tlb mm references are removed
+         before the mm is freed.
+
+         If unsure, say N.
+
 config DEBUG_VM_MAPLE_TREE
        bool "Debug VM maple trees"
        depends on DEBUG_VM
@@ -1480,6 +1490,15 @@ config CSD_LOCK_WAIT_DEBUG
          include the IPI handler function currently executing (if any)
          and relevant stack traces.
 
+config CSD_LOCK_WAIT_DEBUG_DEFAULT
+       bool "Default csd_lock_wait() debugging on at boot time"
+       depends on CSD_LOCK_WAIT_DEBUG
+       depends on 64BIT
+       default n
+       help
+         This option causes the csdlock_debug= kernel boot parameter to
+         default to 1 (basic debugging) instead of 0 (no debugging).
+
 endmenu # lock debugging
 
 config TRACE_IRQFLAGS
@@ -1958,9 +1977,21 @@ config FAIL_SUNRPC
          Provide fault-injection capability for SunRPC and
          its consumers.
 
+config FAULT_INJECTION_CONFIGFS
+       bool "Configfs interface for fault-injection capabilities"
+       depends on FAULT_INJECTION
+       select CONFIGFS_FS
+       help
+         This option allows configfs-based drivers to dynamically configure
+         fault-injection via configfs.  Each parameter for driver-specific
+         fault-injection can be made visible as a configfs attribute in a
+         configfs group.
+
+
 config FAULT_INJECTION_STACKTRACE_FILTER
        bool "stacktrace filter for fault-injection capabilities"
-       depends on FAULT_INJECTION_DEBUG_FS && STACKTRACE_SUPPORT
+       depends on FAULT_INJECTION
+       depends on (FAULT_INJECTION_DEBUG_FS || FAULT_INJECTION_CONFIGFS) && STACKTRACE_SUPPORT
        select STACKTRACE
        depends on FRAME_POINTER || MIPS || PPC || S390 || MICROBLAZE || ARM || ARC || X86
        help