1 files changed, 8 insertions, 20 deletions

diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c
index 2f6cfd460cb6..6ffcd3203215 100644
--- a/arch/s390/kernel/ipl.c
+++ b/arch/s390/kernel/ipl.c
@@ -1,8 +1,7 @@
 /*
- *  arch/s390/kernel/ipl.c
  *    ipl/reipl/dump support for Linux on s390.
  *
- *    Copyright IBM Corp. 2005,2012
+ *    Copyright IBM Corp. 2005, 2012
  *    Author(s): Michael Holzheu <holzheu@de.ibm.com>
  *               Heiko Carstens <heiko.carstens@de.ibm.com>
  *               Volker Sameske <sameske@de.ibm.com>
@@ -1528,15 +1527,12 @@ static struct shutdown_action __refdata dump_action = {
 
 static void dump_reipl_run(struct shutdown_trigger *trigger)
 {
-        struct {
-                void    *addr;
-                __u32   csum;
-        } __packed ipib;
+        unsigned long ipib = (unsigned long) reipl_block_actual;
+        unsigned int csum;
 
-        ipib.csum = csum_partial(reipl_block_actual,
-                                 reipl_block_actual->hdr.len, 0);
-        ipib.addr = reipl_block_actual;
-        memcpy_absolute(&S390_lowcore.ipib, &ipib, sizeof(ipib));
+        csum = csum_partial(reipl_block_actual, reipl_block_actual->hdr.len, 0);
+        mem_assign_absolute(S390_lowcore.ipib, ipib);
+        mem_assign_absolute(S390_lowcore.ipib_checksum, csum);
         dump_run(trigger);
 }
 
@@ -1587,7 +1583,7 @@ static struct kset *vmcmd_kset;
 
 static void vmcmd_run(struct shutdown_trigger *trigger)
 {
-        char *cmd, *next_cmd;
+        char *cmd;
 
         if (strcmp(trigger->name, ON_REIPL_STR) == 0)
                 cmd = vmcmd_on_reboot;
@@ -1604,15 +1600,7 @@ static void vmcmd_run(struct shutdown_trigger *trigger)
 
         if (strlen(cmd) == 0)
                 return;
-        do {
-                next_cmd = strchr(cmd, '\n');
-                if (next_cmd) {
-                        next_cmd[0] = 0;
-                        next_cmd += 1;
-                }
-                __cpcmd(cmd, NULL, 0, NULL);
-                cmd = next_cmd;
-        } while (cmd != NULL);
+        __cpcmd(cmd, NULL, 0, NULL);
 }
 
 static int vmcmd_init(void)