2 files changed, 22 insertions, 6 deletions

diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
index 29f7baa25110..af3192d2a5a3 100644
--- a/net/iucv/af_iucv.c
+++ b/net/iucv/af_iucv.c
@@ -8,6 +8,9 @@
  *  Author(s):  Jennifer Hunt <jenhunt@us.ibm.com>
  */
 
+#define KMSG_COMPONENT "af_iucv"
+#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
+
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/list.h>
@@ -616,6 +619,8 @@ static int iucv_sock_sendmsg(struct kiocb *iocb, struct socket *sock,
         struct iucv_sock *iucv = iucv_sk(sk);
         struct sk_buff *skb;
         struct iucv_message txmsg;
+        char user_id[9];
+        char appl_id[9];
         int err;
 
         err = sock_error(sk);
@@ -651,8 +656,15 @@ static int iucv_sock_sendmsg(struct kiocb *iocb, struct socket *sock,
                 err = iucv_message_send(iucv->path, &txmsg, 0, 0,
                                         (void *) skb->data, skb->len);
                 if (err) {
-                        if (err == 3)
-                                printk(KERN_ERR "AF_IUCV msg limit exceeded\n");
+                        if (err == 3) {
+                                user_id[8] = 0;
+                                memcpy(user_id, iucv->dst_user_id, 8);
+                                appl_id[8] = 0;
+                                memcpy(appl_id, iucv->dst_name, 8);
+                                pr_err("Application %s on z/VM guest %s"
+                                       " exceeds message limit\n",
+                                       user_id, appl_id);
+                        }
                         skb_unlink(skb, &iucv->send_skb_q);
                         err = -EPIPE;
                         goto fail;
@@ -1190,7 +1202,8 @@ static int __init afiucv_init(void)
         int err;
 
         if (!MACHINE_IS_VM) {
-                printk(KERN_ERR "AF_IUCV connection needs VM as base\n");
+                pr_err("The af_iucv module cannot be loaded"
+                       " without z/VM\n");
                 err = -EPROTONOSUPPORT;
                 goto out;
         }
diff --git a/net/iucv/iucv.c b/net/iucv/iucv.c
index 6bf51f7e597f..8f57d4f4328a 100644
--- a/net/iucv/iucv.c
+++ b/net/iucv/iucv.c
@@ -30,6 +30,9 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#define KMSG_COMPONENT "iucv"
+#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
+
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/spinlock.h>
@@ -424,8 +427,8 @@ static void iucv_declare_cpu(void *data)
                         err = "Paging or storage error";
                         break;
                 }
-                printk(KERN_WARNING "iucv_register: iucv_declare_buffer "
-                       "on cpu %i returned error 0x%02x (%s)\n", cpu, rc, err);
+                pr_warning("Defining an interrupt buffer on CPU %i"
+                           " failed with 0x%02x (%s)\n", cpu, rc, err);
                 return;
         }
 
@@ -1652,7 +1655,7 @@ static void iucv_external_interrupt(u16 code)
         BUG_ON(p->iptype  < 0x01 || p->iptype > 0x09);
         work = kmalloc(sizeof(struct iucv_irq_list), GFP_ATOMIC);
         if (!work) {
-                printk(KERN_WARNING "iucv_external_interrupt: out of memory\n");
+                pr_warning("iucv_external_interrupt: out of memory\n");
                 return;
         }
         memcpy(&work->data, p, sizeof(work->data));