Merge head 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev

[linux-2.6] / drivers / s390 / char / vmcp.c

diff --git a/drivers/s390/char/vmcp.c b/drivers/s390/char/vmcp.c
index dfbbf235ca2b39dd5a15c0d89d184327ebe95e38..8990d8076e7da0733d7c8bb0a8b32fa55908af2d 100644 (file)
--- a/drivers/s390/char/vmcp.c
+++ b/drivers/s390/char/vmcp.c
@@ -115,9 +115,9 @@ vmcp_write(struct file *file, const char __user * buff, size_t count,
                return -ENOMEM;
        }
        debug_text_event(vmcp_debug, 1, cmd);
-       session->resp_size = cpcmd(cmd, session->response,
-                                  session->bufsize,
-                                  &session->resp_code);
+       session->resp_size = __cpcmd(cmd, session->response,
+                                    session->bufsize,
+                                    &session->resp_code);
        up(&session->mutex);
        kfree(cmd);
        *ppos = 0;              /* reset the file pointer after a command */
@@ -203,7 +203,7 @@ static int __init vmcp_init(void)
        else
                printk(KERN_WARNING
                       "z/VM CP interface not loaded. Could not register misc device.\n");
-       vmcp_debug = debug_register("vmcp", 0, 1, 240);
+       vmcp_debug = debug_register("vmcp", 1, 1, 240);
        debug_register_view(vmcp_debug, &debug_hex_ascii_view);
        return ret;
 }