diff options
author | Jan Glauber <jan.glauber@de.ibm.com> | 2006-02-01 06:06:34 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-01 11:53:24 -0500 |
commit | 3633b0475eb269dcb85923b23b321505f06b9488 (patch) | |
tree | 48e4f85a5f02ba4c56ebc7acbf963372f5f5f573 /drivers/s390/Kconfig | |
parent | 32f65f274602b43e8f48314e9769f254da1d8323 (diff) |
[PATCH] s390: hangcheck timer support
Remove useless s390 define from hangcheck-timer, remove wrong definition of a
TOD second and other s390 ifdefs. Use monotonic_clock instead.
Add hangcheck-timer option, copied from drivers/char/Kconfig. This is ugly
but unless we have a big Kconfig cleanup we cannot include
drivers/char/Kconfig...
Signed-off-by: Jan Glauber <jan.glauber@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/s390/Kconfig')
-rw-r--r-- | drivers/s390/Kconfig | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/s390/Kconfig b/drivers/s390/Kconfig index a86a650f3d6d..721787cc5a1c 100644 --- a/drivers/s390/Kconfig +++ b/drivers/s390/Kconfig | |||
@@ -51,6 +51,13 @@ config UNIX98_PTY_COUNT | |||
51 | When not in use, each additional set of 256 PTYs occupy | 51 | When not in use, each additional set of 256 PTYs occupy |
52 | approximately 8 KB of kernel memory on 32-bit architectures. | 52 | approximately 8 KB of kernel memory on 32-bit architectures. |
53 | 53 | ||
54 | config HANGCHECK_TIMER | ||
55 | tristate "Hangcheck timer" | ||
56 | help | ||
57 | The hangcheck-timer module detects when the system has gone | ||
58 | out to lunch past a certain margin. It can reboot the system | ||
59 | or merely print a warning. | ||
60 | |||
54 | source "drivers/char/watchdog/Kconfig" | 61 | source "drivers/char/watchdog/Kconfig" |
55 | 62 | ||
56 | comment "S/390 character device drivers" | 63 | comment "S/390 character device drivers" |