2 files changed, 41 insertions, 2 deletions

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 0d189c93eeaf..25f8d20dac53 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1689,9 +1689,14 @@ running once the system is up.
                         decrease the size and leave more room for directly
                         mapped kernel RAM.
 
-        vmhalt=         [KNL,S390]
+        vmhalt=         [KNL,S390] Perform z/VM CP command after system halt.
+                        Format: <command>
 
-        vmpoff=         [KNL,S390]
+        vmpanic=        [KNL,S390] Perform z/VM CP command after kernel panic.
+                        Format: <command>
+
+        vmpoff=         [KNL,S390] Perform z/VM CP command after power off.
+                        Format: <command>
 
         waveartist=     [HW,OSS]
                         Format: <io>,<irq>,<dma>,<dma2>
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index 813444aac7d7..2b2551e3510b 100644
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -37,6 +37,7 @@
 #include <linux/seq_file.h>
 #include <linux/kernel_stat.h>
 #include <linux/device.h>
+#include <linux/notifier.h>
 
 #include <asm/uaccess.h>
 #include <asm/system.h>
@@ -115,6 +116,7 @@ void __devinit cpu_init (void)
  */
 char vmhalt_cmd[128] = "";
 char vmpoff_cmd[128] = "";
+char vmpanic_cmd[128] = "";
 
 static inline void strncpy_skip_quote(char *dst, char *src, int n)
 {
@@ -146,6 +148,38 @@ static int __init vmpoff_setup(char *str)
 
 __setup("vmpoff=", vmpoff_setup);
 
+static int vmpanic_notify(struct notifier_block *self, unsigned long event,
+                          void *data)
+{
+        if (MACHINE_IS_VM && strlen(vmpanic_cmd) > 0)
+                cpcmd(vmpanic_cmd, NULL, 0, NULL);
+
+        return NOTIFY_OK;
+}
+
+#define PANIC_PRI_VMPANIC       0
+
+static struct notifier_block vmpanic_nb = {
+        .notifier_call = vmpanic_notify,
+        .priority = PANIC_PRI_VMPANIC
+};
+
+static int __init vmpanic_setup(char *str)
+{
+        static int register_done __initdata = 0;
+
+        strncpy_skip_quote(vmpanic_cmd, str, 127);
+        vmpanic_cmd[127] = 0;
+        if (!register_done) {
+                register_done = 1;
+                atomic_notifier_chain_register(&panic_notifier_list,
+                                               &vmpanic_nb);
+        }
+        return 1;
+}
+
+__setup("vmpanic=", vmpanic_setup);
+
 /*
  * condev= and conmode= setup parameter.
  */