Skip to contentSkip to conversation

s390 (9/12): z/VM watchdog timer.

PATCH New Martin Schwidefsky 1 participant 1 message Oct 8, 2004

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 s390 (9/12): z/VM watchdog timer.

[PATCH] s390: z/VM watchdog timer.

From: Arnd Bergmann <[email protected]>

Add support for z/VM watchdog timer.

diffstat:

 arch/s390/defconfig            |    5 
 drivers/char/watchdog/Kconfig  |   14 +
 drivers/s390/Kconfig           |    2 
 drivers/s390/char/Makefile     |    2 
 drivers/s390/char/vmwatchdog.c |  296 +++++++++++++++++++++++++++++++++++++++++
 5 files changed, 319 insertions(+)
arch/s390/defconfig +5 -0
diff -urN linux-2.6/arch/s390/defconfig linux-2.6-patched/arch/s390/defconfig
@@ -192,6 +192,11 @@
 CONFIG_UNIX98_PTY_COUNT=2048
 
 #
+# Watchdog Cards
+#
+# CONFIG_WATCHDOG is not set
+
+#
 # S/390 character device drivers
 #
 CONFIG_TN3270=y
drivers/char/watchdog/Kconfig +14 -0
diff -urN linux-2.6/drivers/char/watchdog/Kconfig linux-2.6-patched/drivers/char/watchdog/Kconfig
@@ -336,6 +336,20 @@
 	  timer expired and no process has written to /dev/watchdog during
 	  that time.
 
+# S390 Architecture
+
+config ZVM_WATCHDOG
+	tristate "z/VM Watchdog Timer"
+	depends on WATCHDOG && ARCH_S390
+	help
+	  IBM s/390 and zSeries machines running under z/VM 5.1 or later
+	  provide a virtual watchdog timer to their guest that cause a
+	  user define Control Program command to be executed after a
+	  timeout.
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called vmwatchdog.
+
 # SUPERH Architecture
 
 config SH_WDT
drivers/s390/char/Makefile +2 -0
diff -urN linux-2.6/drivers/s390/char/Makefile linux-2.6-patched/drivers/s390/char/Makefile
@@ -17,6 +17,8 @@
 obj-$(CONFIG_SCLP_VT220_TTY) += sclp_vt220.o
 obj-$(CONFIG_SCLP_CPI) += sclp_cpi.o
 
+obj-$(CONFIG_ZVM_WATCHDOG) += vmwatchdog.o
+
 tape-$(CONFIG_S390_TAPE_BLOCK) += tape_block.o
 tape-$(CONFIG_PROC_FS) += tape_proc.o
 tape-objs := tape_core.o tape_std.o tape_char.o $(tape-y)
drivers/s390/char/vmwatchdog.c +296 -0

296 lines not on this page · raw message

drivers/s390/Kconfig +2 -0
diff -urN linux-2.6/drivers/s390/Kconfig linux-2.6-patched/drivers/s390/Kconfig
@@ -51,6 +51,8 @@
 	  When not in use, each additional set of 256 PTYs occupy
 	  approximately 8 KB of kernel memory on 32-bit architectures.
 
+source "drivers/char/watchdog/Kconfig"
+
 comment "S/390 character device drivers"
 
 config TN3270