Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

2 files changed, 3 insertions, 3 deletions

diff --git a/arch/s390/mm/cmm.c b/arch/s390/mm/cmm.c
index f5a5bc09b8fa..2d5cb1385753 100644
--- a/arch/s390/mm/cmm.c
+++ b/arch/s390/mm/cmm.c
@@ -21,7 +21,7 @@
 #include <asm/uaccess.h>
 
 static char *sender = "VMRMSVM";
-module_param(sender, charp, 0);
+module_param(sender, charp, 0400);
 MODULE_PARM_DESC(sender,
                  "Guest name that may send SMSG messages (default VMRMSVM)");
 
diff --git a/arch/s390/mm/extmem.c b/arch/s390/mm/extmem.c
index 648deed17e25..c5348108ca3c 100644
--- a/arch/s390/mm/extmem.c
+++ b/arch/s390/mm/extmem.c
@@ -576,8 +576,8 @@ segment_save(char *name)
                         segtype_string[seg->range[i].start & 0xff]);
         }
         sprintf(cmd2, "SAVESEG %s", name);
-        cpcmd(cmd1, NULL, 0);
-        cpcmd(cmd2, NULL, 0);
+        cpcmd(cmd1, NULL, 0, NULL);
+        cpcmd(cmd2, NULL, 0, NULL);
         spin_unlock(&dcss_lock);
 }