1 files changed, 7 insertions, 2 deletions

diff --git a/arch/s390/mm/cmm.c b/arch/s390/mm/cmm.c
index a9550dca3e4b..1f1dba9dcf58 100644
--- a/arch/s390/mm/cmm.c
+++ b/arch/s390/mm/cmm.c
@@ -23,7 +23,10 @@
 #include <asm/pgalloc.h>
 #include <asm/diag.h>
 
-static char *sender = "VMRMSVM";
+#ifdef CONFIG_CMM_IUCV
+static char *cmm_default_sender = "VMRMSVM";
+#endif
+static char *sender;
 module_param(sender, charp, 0400);
 MODULE_PARM_DESC(sender,
                  "Guest name that may send SMSG messages (default VMRMSVM)");
@@ -88,7 +91,7 @@ static long cmm_alloc_pages(long nr, long *counter,
                         } else
                                 free_page((unsigned long) npa);
                 }
-                diag10(addr);
+                diag10_range(addr >> PAGE_SHIFT, 1);
                 pa->pages[pa->index++] = addr;
                 (*counter)++;
                 spin_unlock(&cmm_lock);
@@ -440,6 +443,8 @@ static int __init cmm_init(void)
                 int len = strlen(sender);
                 while (len--)
                         sender[len] = toupper(sender[len]);
+        } else {
+                sender = cmm_default_sender;
         }
 
         rc = smsg_register_callback(SMSG_PREFIX, cmm_smsg_target);