[patch 15/15] kmsg: convert monwriter printk messages to kmsg api.

[Martin Schwidefsky <schwidefsky@de.ibm.com>]

[-- Attachment #1: 815-kmsg-monwriter.diff --]
[-- Type: text/plain, Size: 1993 bytes --]

From: Melissa Howland <melissah@us.ibm.com>

Signed-off-by: Melissa Howland <melissah@us.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
---

 Documentation/s390/kmsg/monwriter |   17 +++++++++++++++++
 drivers/s390/char/monwriter.c     |    4 +++-
 2 files changed, 20 insertions(+), 1 deletion(-)

Index: quilt-2.6/Documentation/s390/kmsg/monwriter
===================================================================
--- /dev/null
+++ quilt-2.6/Documentation/s390/kmsg/monwriter
@@ -0,0 +1,17 @@
+/*?
+ * Tag: monwriter.1
+ * Text: "Writing monitor data failed with rc=%i"
+ * Severity: Error
+ * Parameter:
+ *   @1: return code
+ * Description:
+ * The monitor stream application device driver used the z/VM diagnose call
+ * DIAG X'DC' to start writing monitor data. z/VM returned an error and the
+ * monitor data cannot be written. If the return code is 5, your z/VM guest
+ * virtual machine is not authorized to write monitor data.
+ * User action:
+ * If the return code is 5, ensure that your z/VM guest virtual machine's
+ * entry in the z/VM directory includes the OPTION APPLMON statement.
+ * For other return codes see the section about DIAGNOSE Code X'DC'
+ * in "z/VM CP Programming Services".
+ */
Index: quilt-2.6/drivers/s390/char/monwriter.c
===================================================================
--- quilt-2.6.orig/drivers/s390/char/monwriter.c
+++ quilt-2.6/drivers/s390/char/monwriter.c
@@ -24,7 +24,9 @@
 #include <asm/io.h>
 #include <asm/appldata.h>
 #include <asm/monwriter.h>
+#include <asm/kmsg.h>
 
+#define KMSG_COMPONENT "monwriter"
 #define MONWRITE_MAX_DATALEN	4010
 
 static int mon_max_bufs = 255;
@@ -66,7 +68,7 @@ static int monwrite_diag(struct monwrite
 		return rc;
 	if (rc == 5)
 		return -EPERM;
-	printk("DIAG X'DC' error with return code: %i\n", rc);
+	kmsg_err(1,"Writing monitor data failed with rc=%i\n", rc);
 	return -EINVAL;
 }
 

-- 
blue skies,
   Martin.

"Reality continues to ruin my life." - Calvin.