diff options
| -rw-r--r-- | drivers/misc/Makefile | 1 | ||||
| -rw-r--r-- | lib/Kconfig.debug | 15 | ||||
| -rw-r--r-- | tests/Kconfig | 15 | ||||
| -rw-r--r-- | tests/Makefile | 1 | ||||
| -rw-r--r-- | tests/lkdtm.c (renamed from drivers/misc/lkdtm.c) | 12 |
5 files changed, 22 insertions, 22 deletions
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile index 3b12f5da8562..df05af0d3719 100644 --- a/drivers/misc/Makefile +++ b/drivers/misc/Makefile @@ -11,7 +11,6 @@ obj-$(CONFIG_ASUS_LAPTOP) += asus-laptop.o obj-$(CONFIG_ATMEL_PWM) += atmel_pwm.o obj-$(CONFIG_ATMEL_SSC) += atmel-ssc.o obj-$(CONFIG_TC1100_WMI) += tc1100-wmi.o -obj-$(CONFIG_LKDTM) += lkdtm.o obj-$(CONFIG_TIFM_CORE) += tifm_core.o obj-$(CONFIG_TIFM_7XX1) += tifm_7xx1.o obj-$(CONFIG_PHANTOM) += phantom.o diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index 3f9d67f09df6..351f1ad5e58d 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@ -490,21 +490,6 @@ config BACKTRACE_SELF_TEST Say N if you are unsure. -config LKDTM - tristate "Linux Kernel Dump Test Tool Module" - depends on DEBUG_KERNEL - depends on KPROBES - default n - help - This module enables testing of the different dumping mechanisms by - inducing system failures at predefined crash points. - If you don't need it: say N - Choose M here to compile this code as a module. The module will be - called 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 diff --git a/tests/Kconfig b/tests/Kconfig index 7b10329feb17..8619eec3bfab 100644 --- a/tests/Kconfig +++ b/tests/Kconfig @@ -37,4 +37,19 @@ config RT_MUTEX_TESTER help This option enables a rt-mutex tester. +config LKDTM + tristate "Linux Kernel Dump Test Tool Module" + depends on DEBUG_KERNEL + depends on KPROBES + default n + help + This module enables testing of the different dumping mechanisms by + inducing system failures at predefined crash points. + If you don't need it: say N + Choose M here to compile this code as a module. The module will be + called lkdtm. + + Documentation on how to use the module can be found in + tests/lkdtm.c + endif # KERNEL_TESTS diff --git a/tests/Makefile b/tests/Makefile index c1c617971312..ee7979ff2d8f 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -5,3 +5,4 @@ obj-$(CONFIG_DEBUG_LOCKING_API_SELFTESTS) += locking-selftest.o obj-$(CONFIG_RCU_TORTURE_TEST) += rcutorture.o obj-$(CONFIG_RT_MUTEX_TESTER) += rtmutex-tester.o +obj-$(CONFIG_LKDTM) += lkdtm.o diff --git a/drivers/misc/lkdtm.c b/tests/lkdtm.c index c884730c5eaf..e196eb5975d2 100644 --- a/drivers/misc/lkdtm.c +++ b/tests/lkdtm.c @@ -216,7 +216,7 @@ static int lkdtm_parse_commandline(void) } if (cpoint == INVALID || cptype == NONE) - return -EINVAL; + return -EINVAL; count = cpoint_count; @@ -232,7 +232,7 @@ static int recursive_loop(int a) if (!recur_count) return 0; else - return recursive_loop(a); + return recursive_loop(a); } void lkdtm_handler(void) @@ -324,8 +324,8 @@ static int __init lkdtm_module_init(void) } if ((ret = register_jprobe(&lkdtm)) < 0) { - printk(KERN_INFO "lkdtm : Couldn't register jprobe\n"); - return ret; + printk(KERN_INFO "lkdtm : Couldn't register jprobe\n"); + return ret; } printk(KERN_INFO "lkdtm : Crash point %s of type %s registered\n", @@ -335,8 +335,8 @@ static int __init lkdtm_module_init(void) static void __exit lkdtm_module_exit(void) { - unregister_jprobe(&lkdtm); - printk(KERN_INFO "lkdtm : Crash point unregistered\n"); + unregister_jprobe(&lkdtm); + printk(KERN_INFO "lkdtm : Crash point unregistered\n"); } module_init(lkdtm_module_init); |