4 files changed, 6 insertions, 7 deletions

diff --git a/arch/s390/pci/pci_debug.c b/arch/s390/pci/pci_debug.c
index 75c69b402e05..c5c66840ac00 100644
--- a/arch/s390/pci/pci_debug.c
+++ b/arch/s390/pci/pci_debug.c
@@ -139,7 +139,7 @@ void zpci_debug_exit_device(struct zpci_dev *zdev)
 int __init zpci_debug_init(void)
 {
         /* event trace buffer */
-        pci_debug_msg_id = debug_register("pci_msg", 16, 1, 16 * sizeof(long));
+        pci_debug_msg_id = debug_register("pci_msg", 8, 1, 8 * sizeof(long));
         if (!pci_debug_msg_id)
                 return -EINVAL;
         debug_register_view(pci_debug_msg_id, &debug_sprintf_view);
diff --git a/drivers/s390/cio/chsc_sch.c b/drivers/s390/cio/chsc_sch.c
index 7b29d0be0ca3..1d3661af7bd8 100644
--- a/drivers/s390/cio/chsc_sch.c
+++ b/drivers/s390/cio/chsc_sch.c
@@ -173,8 +173,7 @@ static struct css_driver chsc_subchannel_driver = {
 
 static int __init chsc_init_dbfs(void)
 {
-        chsc_debug_msg_id = debug_register("chsc_msg", 16, 1,
-                                           16 * sizeof(long));
+        chsc_debug_msg_id = debug_register("chsc_msg", 8, 1, 4 * sizeof(long));
         if (!chsc_debug_msg_id)
                 goto out;
         debug_register_view(chsc_debug_msg_id, &debug_sprintf_view);
diff --git a/drivers/s390/cio/cio.c b/drivers/s390/cio/cio.c
index 8ee88c4ebd83..97c48b38d67d 100644
--- a/drivers/s390/cio/cio.c
+++ b/drivers/s390/cio/cio.c
@@ -54,7 +54,7 @@ debug_info_t *cio_debug_crw_id;
  */
 static int __init cio_debug_init(void)
 {
-        cio_debug_msg_id = debug_register("cio_msg", 16, 1, 16 * sizeof(long));
+        cio_debug_msg_id = debug_register("cio_msg", 16, 1, 11 * sizeof(long));
         if (!cio_debug_msg_id)
                 goto out_unregister;
         debug_register_view(cio_debug_msg_id, &debug_sprintf_view);
@@ -64,7 +64,7 @@ static int __init cio_debug_init(void)
                 goto out_unregister;
         debug_register_view(cio_debug_trace_id, &debug_hex_ascii_view);
         debug_set_level(cio_debug_trace_id, 2);
-        cio_debug_crw_id = debug_register("cio_crw", 16, 1, 16 * sizeof(long));
+        cio_debug_crw_id = debug_register("cio_crw", 8, 1, 8 * sizeof(long));
         if (!cio_debug_crw_id)
                 goto out_unregister;
         debug_register_view(cio_debug_crw_id, &debug_sprintf_view);
diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c
index c3a83df07894..bd5d4ab4bcf7 100644
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@ -33,8 +33,8 @@ struct qeth_dbf_info qeth_dbf[QETH_DBF_INFOS] = {
         /*                   N  P  A    M  L  V                      H  */
         [QETH_DBF_SETUP] = {"qeth_setup",
                                 8, 1,   8, 5, &debug_hex_ascii_view, NULL},
-        [QETH_DBF_MSG]   = {"qeth_msg",
-                                8, 1, 128, 3, &debug_sprintf_view,   NULL},
+        [QETH_DBF_MSG]   = {"qeth_msg", 8, 1, 11 * sizeof(long), 3,
+                            &debug_sprintf_view, NULL},
         [QETH_DBF_CTRL]  = {"qeth_control",
                 8, 1, QETH_DBF_CTRL_LEN, 5, &debug_hex_ascii_view, NULL},
 };