| Message ID | alpine.LRH.2.02.1804251601160.30569@file01.intranet.prod.int.rdu2.redhat.com |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | fault-injection: reorder config entries | expand |
On 04/25/2018 01:02 PM, Mikulas Patocka wrote: > This patch reorders Kconfig entries, so that menuconfig displays proper > indentation. > > Signed-off-by: Mikulas Patocka <mpatocka@redhat.com> Acked-by: Randy Dunlap <rdunlap@infradead.org> Tested-by: Randy Dunlap <rdunlap@infradead.org> Thanks. > --- > lib/Kconfig.debug | 36 ++++++++++++++++++------------------ > 1 file changed, 18 insertions(+), 18 deletions(-) > > Index: linux-2.6/lib/Kconfig.debug > =================================================================== > --- linux-2.6.orig/lib/Kconfig.debug 2018-04-16 21:08:36.000000000 +0200 > +++ linux-2.6/lib/Kconfig.debug 2018-04-25 15:56:16.000000000 +0200 > @@ -1503,6 +1503,10 @@ config NETDEV_NOTIFIER_ERROR_INJECT > > If unsure, say N. > > +config FUNCTION_ERROR_INJECTION > + def_bool y > + depends on HAVE_FUNCTION_ERROR_INJECTION && KPROBES > + > config FAULT_INJECTION > bool "Fault-injection framework" > depends on DEBUG_KERNEL > @@ -1510,10 +1514,6 @@ config FAULT_INJECTION > Provide fault-injection framework. > For more details, see Documentation/fault-injection/. > > -config FUNCTION_ERROR_INJECTION > - def_bool y > - depends on HAVE_FUNCTION_ERROR_INJECTION && KPROBES > - > config FAILSLAB > bool "Fault-injection capability for kmalloc" > depends on FAULT_INJECTION > @@ -1544,16 +1544,6 @@ config FAIL_IO_TIMEOUT > Only works with drivers that use the generic timeout handling, > for others it wont do anything. > > -config FAIL_MMC_REQUEST > - bool "Fault-injection capability for MMC IO" > - depends on FAULT_INJECTION_DEBUG_FS && MMC > - help > - Provide fault-injection capability for MMC IO. > - This will make the mmc core return data errors. This is > - useful to test the error handling in the mmc block device > - and to test how the mmc host driver handles retries from > - the block device. > - > config FAIL_FUTEX > bool "Fault-injection capability for futexes" > select DEBUG_FS > @@ -1561,6 +1551,12 @@ config FAIL_FUTEX > help > Provide fault-injection capability for futexes. > > +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. > + > config FAIL_FUNCTION > bool "Fault-injection capability for functions" > depends on FAULT_INJECTION_DEBUG_FS && FUNCTION_ERROR_INJECTION > @@ -1571,11 +1567,15 @@ config FAIL_FUNCTION > an error value and have to handle it. This is useful to test the > error handling in various subsystems. > > -config FAULT_INJECTION_DEBUG_FS > - bool "Debugfs entries for fault-injection capabilities" > - depends on FAULT_INJECTION && SYSFS && DEBUG_FS > +config FAIL_MMC_REQUEST > + bool "Fault-injection capability for MMC IO" > + depends on FAULT_INJECTION_DEBUG_FS && MMC > help > - Enable configuration of fault-injection capabilities via debugfs. > + Provide fault-injection capability for MMC IO. > + This will make the mmc core return data errors. This is > + useful to test the error handling in the mmc block device > + and to test how the mmc host driver handles retries from > + the block device. > > config FAULT_INJECTION_STACKTRACE_FILTER > bool "stacktrace filter for fault-injection capabilities" >
Index: linux-2.6/lib/Kconfig.debug =================================================================== --- linux-2.6.orig/lib/Kconfig.debug 2018-04-16 21:08:36.000000000 +0200 +++ linux-2.6/lib/Kconfig.debug 2018-04-25 15:56:16.000000000 +0200 @@ -1503,6 +1503,10 @@ config NETDEV_NOTIFIER_ERROR_INJECT If unsure, say N. +config FUNCTION_ERROR_INJECTION + def_bool y + depends on HAVE_FUNCTION_ERROR_INJECTION && KPROBES + config FAULT_INJECTION bool "Fault-injection framework" depends on DEBUG_KERNEL @@ -1510,10 +1514,6 @@ config FAULT_INJECTION Provide fault-injection framework. For more details, see Documentation/fault-injection/. -config FUNCTION_ERROR_INJECTION - def_bool y - depends on HAVE_FUNCTION_ERROR_INJECTION && KPROBES - config FAILSLAB bool "Fault-injection capability for kmalloc" depends on FAULT_INJECTION @@ -1544,16 +1544,6 @@ config FAIL_IO_TIMEOUT Only works with drivers that use the generic timeout handling, for others it wont do anything. -config FAIL_MMC_REQUEST - bool "Fault-injection capability for MMC IO" - depends on FAULT_INJECTION_DEBUG_FS && MMC - help - Provide fault-injection capability for MMC IO. - This will make the mmc core return data errors. This is - useful to test the error handling in the mmc block device - and to test how the mmc host driver handles retries from - the block device. - config FAIL_FUTEX bool "Fault-injection capability for futexes" select DEBUG_FS @@ -1561,6 +1551,12 @@ config FAIL_FUTEX help Provide fault-injection capability for futexes. +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. + config FAIL_FUNCTION bool "Fault-injection capability for functions" depends on FAULT_INJECTION_DEBUG_FS && FUNCTION_ERROR_INJECTION @@ -1571,11 +1567,15 @@ config FAIL_FUNCTION an error value and have to handle it. This is useful to test the error handling in various subsystems. -config FAULT_INJECTION_DEBUG_FS - bool "Debugfs entries for fault-injection capabilities" - depends on FAULT_INJECTION && SYSFS && DEBUG_FS +config FAIL_MMC_REQUEST + bool "Fault-injection capability for MMC IO" + depends on FAULT_INJECTION_DEBUG_FS && MMC help - Enable configuration of fault-injection capabilities via debugfs. + Provide fault-injection capability for MMC IO. + This will make the mmc core return data errors. This is + useful to test the error handling in the mmc block device + and to test how the mmc host driver handles retries from + the block device. config FAULT_INJECTION_STACKTRACE_FILTER bool "stacktrace filter for fault-injection capabilities"
This patch reorders Kconfig entries, so that menuconfig displays proper indentation. Signed-off-by: Mikulas Patocka <mpatocka@redhat.com> --- lib/Kconfig.debug | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-)