Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758495AbYG1R7c (ORCPT ); Mon, 28 Jul 2008 13:59:32 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1760713AbYG1R4S (ORCPT ); Mon, 28 Jul 2008 13:56:18 -0400 Received: from mtagate7.de.ibm.com ([195.212.29.156]:33855 "EHLO mtagate7.de.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758793AbYG1R4R (ORCPT ); Mon, 28 Jul 2008 13:56:17 -0400 Message-Id: <20080728175511.759269403@de.ibm.com> References: <20080728175355.734299984@de.ibm.com> User-Agent: quilt/0.46-1 Date: Mon, 28 Jul 2008 19:53:59 +0200 From: Martin Schwidefsky To: linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org Cc: Christian Borntraeger , Martin Schwidefsky Subject: [patch 04/15] kmsg: convert vmcp to kmsg api. Content-Disposition: inline; filename=803-kmsg-vmcp.diff Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2394 Lines: 73 From: Christian Borntraeger Signed-off-by: Christian Borntraeger Signed-off-by: Martin Schwidefsky --- Documentation/s390/kmsg/vmcp | 15 +++++++++++++++ drivers/s390/char/vmcp.c | 6 ++++-- 2 files changed, 19 insertions(+), 2 deletions(-) Index: quilt-2.6/Documentation/s390/kmsg/vmcp =================================================================== --- /dev/null +++ quilt-2.6/Documentation/s390/kmsg/vmcp @@ -0,0 +1,15 @@ +/*? + * Tag: vmcp.1 + * Text: "The z/VM CP interface device driver cannot be loaded without z/VM" + * Severity: Warning + * Description: + * With the z/VM CP interface you can issue z/VM CP commands from a Linux + * terminal session. On Linux instances that run in environments other than + * the z/VM hypervisor, the z/VM CP interface does not provide any useful + * function and the corresponding vmcp device driver cannot be loaded. + * User action: + * Load the vmcp device driver only on Linux instances that run as guest + * operating systems of the z/VM hypervisor. If the device driver has been + * compiled into the kernel, ignore this message. + */ + Index: quilt-2.6/drivers/s390/char/vmcp.c =================================================================== --- quilt-2.6.orig/drivers/s390/char/vmcp.c +++ quilt-2.6/drivers/s390/char/vmcp.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include "vmcp.h" @@ -26,7 +27,7 @@ MODULE_LICENSE("GPL"); MODULE_AUTHOR("Christian Borntraeger "); MODULE_DESCRIPTION("z/VM CP interface"); -#define PRINTK_HEADER "vmcp: " +#define KMSG_COMPONENT "vmcp" static debug_info_t *vmcp_debug; @@ -193,7 +194,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"); + kmsg_warn(1, "The z/VM CP interface device driver cannot be " + "loaded without z/VM\n"); return -ENODEV; } -- blue skies, Martin. "Reality continues to ruin my life." - Calvin. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/