From 81faa7d5b656bb6a8d6109af18368ad83208b59f Mon Sep 17 00:00:00 2001 From: Christian Borntraeger Date: Thu, 25 Dec 2008 13:39:32 +0100 Subject: [PATCH] --- yaml --- r: 121414 b: refs/heads/master c: 8988e58f8b7d4b5e8b64435bedf84e4b3987a63d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/s390/char/vmcp.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 7f8fc06b9d23..4f383b39ec82 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d1c2f8928a2feab56a181bb7e9afe8f804fd26cd +refs/heads/master: 8988e58f8b7d4b5e8b64435bedf84e4b3987a63d diff --git a/trunk/drivers/s390/char/vmcp.c b/trunk/drivers/s390/char/vmcp.c index d7083b33b0fe..a6087cec55b4 100644 --- a/trunk/drivers/s390/char/vmcp.c +++ b/trunk/drivers/s390/char/vmcp.c @@ -11,6 +11,9 @@ * The idea of this driver is based on cpint from Neale Ferguson and #CP in CMS */ +#define KMSG_COMPONENT "vmcp" +#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt + #include #include #include @@ -25,8 +28,6 @@ MODULE_LICENSE("GPL"); MODULE_AUTHOR("Christian Borntraeger "); MODULE_DESCRIPTION("z/VM CP interface"); -#define PRINTK_HEADER "vmcp: " - static debug_info_t *vmcp_debug; static int vmcp_open(struct inode *inode, struct file *file) @@ -190,7 +191,8 @@ static int __init vmcp_init(void) int ret; if (!MACHINE_IS_VM) { - PRINT_WARN("z/VM CP interface is only available under z/VM\n"); + pr_warning("The z/VM CP interface device driver cannot be " + "loaded without z/VM\n"); return -ENODEV; }