30 files changed, 732 insertions, 213 deletions

diff --git a/drivers/s390/Kconfig b/drivers/s390/Kconfig
index 96413c2cd1ad..a86a650f3d6d 100644
--- a/drivers/s390/Kconfig
+++ b/drivers/s390/Kconfig
@@ -187,6 +187,13 @@ config VMLOGRDR
           *SYMPTOM.
           This driver depends on the IUCV support driver.
 
+config VMCP
+        tristate "Support for the z/VM CP interface (VM only)"
+        help
+          Select this option if you want to be able to interact with the control
+          program on z/VM
+
+
 config MONREADER
         tristate "API for reading z/VM monitor service records"
         depends on IUCV
diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index ceeb3cf64a16..6527ff6f4706 100644
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -176,7 +176,7 @@ dasd_state_known_to_basic(struct dasd_device * device)
                 return rc;
 
         /* register 'device' debug area, used for all DBF_DEV_XXX calls */
-        device->debug_area = debug_register(device->cdev->dev.bus_id, 0, 2,
+        device->debug_area = debug_register(device->cdev->dev.bus_id, 1, 2,
                                             8 * sizeof (long));
         debug_register_view(device->debug_area, &debug_sprintf_view);
         debug_set_level(device->debug_area, DBF_EMERG);
@@ -1952,26 +1952,24 @@ dasd_generic_notify(struct ccw_device *cdev, int event)
  * Automatically online either all dasd devices (dasd_autodetect) or
  * all devices specified with dasd= parameters.
  */
+static int
+__dasd_auto_online(struct device *dev, void *data)
+{
+        struct ccw_device *cdev;
+
+        cdev = to_ccwdev(dev);
+        if (dasd_autodetect || dasd_busid_known(cdev->dev.bus_id) == 0)
+                ccw_device_set_online(cdev);
+        return 0;
+}
+
 void
 dasd_generic_auto_online (struct ccw_driver *dasd_discipline_driver)
 {
         struct device_driver *drv;
-        struct device *d, *dev;
-        struct ccw_device *cdev;
 
         drv = get_driver(&dasd_discipline_driver->driver);
-        down_read(&drv->bus->subsys.rwsem);
-        dev = NULL;
-        list_for_each_entry(d, &drv->devices, driver_list) {
-                dev = get_device(d);
-                if (!dev)
-                        continue;
-                cdev = to_ccwdev(dev);
-                if (dasd_autodetect || dasd_busid_known(cdev->dev.bus_id) == 0)
-                        ccw_device_set_online(cdev);
-                put_device(dev);
-        }
-        up_read(&drv->bus->subsys.rwsem);
+        driver_for_each_device(drv, NULL, NULL, __dasd_auto_online);
         put_driver(drv);
 }
 
@@ -1983,7 +1981,7 @@ dasd_init(void)
         init_waitqueue_head(&dasd_init_waitq);
 
         /* register 'common' DASD debug area, used for all DBF_XXX calls */
-        dasd_debug_area = debug_register("dasd", 0, 2, 8 * sizeof (long));
+        dasd_debug_area = debug_register("dasd", 1, 2, 8 * sizeof (long));
         if (dasd_debug_area == NULL) {
                 rc = -ENOMEM;
                 goto failed;
diff --git a/drivers/s390/block/dasd_proc.c b/drivers/s390/block/dasd_proc.c
index d7f19745911f..43c34f8c5e68 100644
--- a/drivers/s390/block/dasd_proc.c
+++ b/drivers/s390/block/dasd_proc.c
@@ -9,13 +9,14 @@
  *
  * /proc interface for the dasd driver.
  *
- * $Revision: 1.31 $
+ * $Revision: 1.32 $
  */
 
 #include <linux/config.h>
 #include <linux/ctype.h>
 #include <linux/seq_file.h>
 #include <linux/vmalloc.h>
+#include <linux/proc_fs.h>
 
 #include <asm/debug.h>
 #include <asm/uaccess.h>
diff --git a/drivers/s390/block/dcssblk.c b/drivers/s390/block/dcssblk.c
index 6bc27d52326f..4fde41188996 100644
--- a/drivers/s390/block/dcssblk.c
+++ b/drivers/s390/block/dcssblk.c
@@ -718,7 +718,7 @@ dcssblk_check_params(void)
                         buf[j-i] = dcssblk_segments[j];
                 }
                 buf[j-i] = '\0';
-                rc = dcssblk_add_store(dcssblk_root_dev, buf, j-i);
+                rc = dcssblk_add_store(dcssblk_root_dev, NULL, buf, j-i);
                 if ((rc >= 0) && (dcssblk_segments[j] == '(')) {
                         for (k = 0; buf[k] != '\0'; k++)
                                 buf[k] = toupper(buf[k]);
@@ -728,7 +728,7 @@ dcssblk_check_params(void)
                                 up_read(&dcssblk_devices_sem);
                                 if (dev_info)
                                         dcssblk_shared_store(&dev_info->dev,
-                                                             "0\n", 2);
+                                                             NULL, "0\n", 2);
                         }
                 }
                 while ((dcssblk_segments[j] != ',') &&
diff --git a/drivers/s390/char/Makefile b/drivers/s390/char/Makefile
index 14e8cce9f862..6377a96735df 100644
--- a/drivers/s390/char/Makefile
+++ b/drivers/s390/char/Makefile
@@ -19,6 +19,7 @@ obj-$(CONFIG_SCLP_CPI) += sclp_cpi.o
 
 obj-$(CONFIG_ZVM_WATCHDOG) += vmwatchdog.o
 obj-$(CONFIG_VMLOGRDR) += vmlogrdr.o
+obj-$(CONFIG_VMCP) += vmcp.o
 
 tape-$(CONFIG_S390_TAPE_BLOCK) += tape_block.o
 tape-$(CONFIG_PROC_FS) += tape_proc.o
diff --git a/drivers/s390/char/con3215.c b/drivers/s390/char/con3215.c
index 022f17bff731..f11a67fda40e 100644
--- a/drivers/s390/char/con3215.c
+++ b/drivers/s390/char/con3215.c
@@ -860,8 +860,8 @@ con3215_init(void)
 
         /* Set the console mode for VM */
         if (MACHINE_IS_VM) {
-                cpcmd("TERM CONMODE 3215", NULL, 0);
-                cpcmd("TERM AUTOCR OFF", NULL, 0);
+                cpcmd("TERM CONMODE 3215", NULL, 0, NULL);
+                cpcmd("TERM AUTOCR OFF", NULL, 0, NULL);
         }
 
         /* allocate 3215 request structures */
diff --git a/drivers/s390/char/con3270.c b/drivers/s390/char/con3270.c
index d52fb57a6b19..fc7a213e591f 100644
--- a/drivers/s390/char/con3270.c
+++ b/drivers/s390/char/con3270.c
@@ -591,8 +591,8 @@ con3270_init(void)
 
         /* Set the console mode for VM */
         if (MACHINE_IS_VM) {
-                cpcmd("TERM CONMODE 3270", 0, 0);
-                cpcmd("TERM AUTOCR OFF", 0, 0);
+                cpcmd("TERM CONMODE 3270", NULL, 0, NULL);
+                cpcmd("TERM AUTOCR OFF", NULL, 0, NULL);
         }
 
         cdev = ccw_device_probe_console();
diff --git a/drivers/s390/char/tape_34xx.c b/drivers/s390/char/tape_34xx.c
index 480ec87976fb..20be88e91fa1 100644
--- a/drivers/s390/char/tape_34xx.c
+++ b/drivers/s390/char/tape_34xx.c
@@ -1351,13 +1351,13 @@ tape_34xx_init (void)
 {
         int rc;
 
-        TAPE_DBF_AREA = debug_register ( "tape_34xx", 1, 2, 4*sizeof(long));
+        TAPE_DBF_AREA = debug_register ( "tape_34xx", 2, 2, 4*sizeof(long));
         debug_register_view(TAPE_DBF_AREA, &debug_sprintf_view);
 #ifdef DBF_LIKE_HELL
         debug_set_level(TAPE_DBF_AREA, 6);
 #endif
 
-        DBF_EVENT(3, "34xx init: $Revision: 1.21 $\n");
+        DBF_EVENT(3, "34xx init: $Revision: 1.23 $\n");
         /* Register driver for 3480/3490 tapes. */
         rc = ccw_driver_register(&tape_34xx_driver);
         if (rc)
@@ -1378,7 +1378,7 @@ tape_34xx_exit(void)
 MODULE_DEVICE_TABLE(ccw, tape_34xx_ids);
 MODULE_AUTHOR("(C) 2001-2002 IBM Deutschland Entwicklung GmbH");
 MODULE_DESCRIPTION("Linux on zSeries channel attached 3480 tape "
-                   "device driver ($Revision: 1.21 $)");
+                   "device driver ($Revision: 1.23 $)");
 MODULE_LICENSE("GPL");
 
 module_init(tape_34xx_init);
diff --git a/drivers/s390/char/tape_core.c b/drivers/s390/char/tape_core.c
index b4df4a515b12..0597aa0e27ee 100644
--- a/drivers/s390/char/tape_core.c
+++ b/drivers/s390/char/tape_core.c
@@ -1186,7 +1186,7 @@ tape_mtop(struct tape_device *device, int mt_op, int mt_count)
 static int
 tape_init (void)
 {
-        TAPE_DBF_AREA = debug_register ( "tape", 1, 2, 4*sizeof(long));
+        TAPE_DBF_AREA = debug_register ( "tape", 2, 2, 4*sizeof(long));
         debug_register_view(TAPE_DBF_AREA, &debug_sprintf_view);
 #ifdef DBF_LIKE_HELL
         debug_set_level(TAPE_DBF_AREA, 6);
diff --git a/drivers/s390/char/tape_proc.c b/drivers/s390/char/tape_proc.c
index 801d17cca34e..5fec0a10cc3d 100644
--- a/drivers/s390/char/tape_proc.c
+++ b/drivers/s390/char/tape_proc.c
@@ -15,6 +15,7 @@
 #include <linux/module.h>
 #include <linux/vmalloc.h>
 #include <linux/seq_file.h>
+#include <linux/proc_fs.h>
 
 #define TAPE_DBF_AREA   tape_core_dbf
 
diff --git a/drivers/s390/char/vmcp.c b/drivers/s390/char/vmcp.c
new file mode 100644
index 000000000000..7f11a608a633
--- /dev/null
+++ b/drivers/s390/char/vmcp.c
@@ -0,0 +1,219 @@
+/*
+ * Copyright (C) 2004,2005 IBM Corporation
+ * Interface implementation for communication with the v/VM control program
+ * Author(s): Christian Borntraeger <cborntra@de.ibm.com>
+ *
+ *
+ * z/VMs CP offers the possibility to issue commands via the diagnose code 8
+ * this driver implements a character device that issues these commands and
+ * returns the answer of CP.
+
+ * The idea of this driver is based on cpint from Neale Ferguson and #CP in CMS
+ */
+
+#include <linux/fs.h>
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/miscdevice.h>
+#include <linux/module.h>
+#include <asm/cpcmd.h>
+#include <asm/debug.h>
+#include <asm/uaccess.h>
+#include "vmcp.h"
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Christian Borntraeger <cborntra@de.ibm.com>");
+MODULE_DESCRIPTION("z/VM CP interface");
+
+static debug_info_t *vmcp_debug;
+
+static int vmcp_open(struct inode *inode, struct file *file)
+{
+        struct vmcp_session *session;
+
+        if (!capable(CAP_SYS_ADMIN))
+                return -EPERM;
+
+        session = kmalloc(sizeof(*session), GFP_KERNEL);
+        if (!session)
+                return -ENOMEM;
+        session->bufsize = PAGE_SIZE;
+        session->response = NULL;
+        session->resp_size = 0;
+        init_MUTEX(&session->mutex);
+        file->private_data = session;
+        return nonseekable_open(inode, file);
+}
+
+static int vmcp_release(struct inode *inode, struct file *file)
+{
+        struct vmcp_session *session;
+
+        session = (struct vmcp_session *)file->private_data;
+        file->private_data = NULL;
+        free_pages((unsigned long)session->response, get_order(session->bufsize));
+        kfree(session);
+        return 0;
+}
+
+static ssize_t
+vmcp_read(struct file *file, char __user * buff, size_t count, loff_t * ppos)
+{
+        size_t tocopy;
+        struct vmcp_session *session;
+
+        session = (struct vmcp_session *)file->private_data;
+        if (down_interruptible(&session->mutex))
+                return -ERESTARTSYS;
+        if (!session->response) {
+                up(&session->mutex);
+                return 0;
+        }
+        if (*ppos > session->resp_size) {
+                up(&session->mutex);
+                return 0;
+        }
+        tocopy = min(session->resp_size - (size_t) (*ppos), count);
+        tocopy = min(tocopy,session->bufsize - (size_t) (*ppos));
+
+        if (copy_to_user(buff, session->response + (*ppos), tocopy)) {
+                up(&session->mutex);
+                return -EFAULT;
+        }
+        up(&session->mutex);
+        *ppos += tocopy;
+        return tocopy;
+}
+
+static ssize_t
+vmcp_write(struct file *file, const char __user * buff, size_t count,
+           loff_t * ppos)
+{
+        char *cmd;
+        struct vmcp_session *session;
+
+        if (count > 240)
+                return -EINVAL;
+        cmd = kmalloc(count + 1, GFP_KERNEL);
+        if (!cmd)
+                return -ENOMEM;
+        if (copy_from_user(cmd, buff, count)) {
+                kfree(cmd);
+                return -EFAULT;
+        }
+        cmd[count] = '\0';
+        session = (struct vmcp_session *)file->private_data;
+        if (down_interruptible(&session->mutex))
+                return -ERESTARTSYS;
+        if (!session->response)
+                session->response = (char *)__get_free_pages(GFP_KERNEL
+                                                | __GFP_REPEAT  | GFP_DMA,
+                                                get_order(session->bufsize));
+        if (!session->response) {
+                up(&session->mutex);
+                kfree(cmd);
+                return -ENOMEM;
+        }
+        debug_text_event(vmcp_debug, 1, cmd);
+        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 */
+        return count;
+}
+
+
+/*
+ * These ioctls are available, as the semantics of the diagnose 8 call
+ * does not fit very well into a Linux call. Diagnose X'08' is described in
+ * CP Programming Services SC24-6084-00
+ *
+ * VMCP_GETCODE: gives the CP return code back to user space
+ * VMCP_SETBUF: sets the response buffer for the next write call. diagnose 8
+ * expects adjacent pages in real storage and to make matters worse, we
+ * dont know the size of the response. Therefore we default to PAGESIZE and
+ * let userspace to change the response size, if userspace expects a bigger
+ * response
+ */
+static long vmcp_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
+{
+        struct vmcp_session *session;
+        int temp;
+
+        session = (struct vmcp_session *)file->private_data;
+        if (down_interruptible(&session->mutex))
+                return -ERESTARTSYS;
+        switch (cmd) {
+        case VMCP_GETCODE:
+                temp = session->resp_code;
+                up(&session->mutex);
+                return put_user(temp, (int __user *)arg);
+        case VMCP_SETBUF:
+                free_pages((unsigned long)session->response,
+                                get_order(session->bufsize));
+                session->response=NULL;
+                temp = get_user(session->bufsize, (int __user *)arg);
+                if (get_order(session->bufsize) > 8) {
+                        session->bufsize = PAGE_SIZE;
+                        temp = -EINVAL;
+                }
+                up(&session->mutex);
+                return temp;
+        case VMCP_GETSIZE:
+                temp = session->resp_size;
+                up(&session->mutex);
+                return put_user(temp, (int __user *)arg);
+        default:
+                up(&session->mutex);
+                return -ENOIOCTLCMD;
+        }
+}
+
+static struct file_operations vmcp_fops = {
+        .owner          = THIS_MODULE,
+        .open           = &vmcp_open,
+        .release        = &vmcp_release,
+        .read           = &vmcp_read,
+        .llseek         = &no_llseek,
+        .write          = &vmcp_write,
+        .unlocked_ioctl = &vmcp_ioctl,
+        .compat_ioctl   = &vmcp_ioctl
+};
+
+static struct miscdevice vmcp_dev = {
+        .name   = "vmcp",
+        .minor  = MISC_DYNAMIC_MINOR,
+        .fops   = &vmcp_fops,
+};
+
+static int __init vmcp_init(void)
+{
+        int ret;
+
+        if (!MACHINE_IS_VM) {
+                printk(KERN_WARNING
+                       "z/VM CP interface is only available under z/VM\n");
+                return -ENODEV;
+        }
+        ret = misc_register(&vmcp_dev);
+        if (!ret)
+                printk(KERN_INFO "z/VM CP interface loaded\n");
+        else
+                printk(KERN_WARNING
+                       "z/VM CP interface not loaded. Could not register misc device.\n");
+        vmcp_debug = debug_register("vmcp", 1, 1, 240);
+        debug_register_view(vmcp_debug, &debug_hex_ascii_view);
+        return ret;
+}
+
+static void __exit vmcp_exit(void)
+{
+        WARN_ON(misc_deregister(&vmcp_dev) != 0);
+        debug_unregister(vmcp_debug);
+        printk(KERN_INFO "z/VM CP interface unloaded.\n");
+}
+
+module_init(vmcp_init);
+module_exit(vmcp_exit);
diff --git a/drivers/s390/char/vmcp.h b/drivers/s390/char/vmcp.h
new file mode 100644
index 000000000000..87389e730465
--- /dev/null
+++ b/drivers/s390/char/vmcp.h
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2004, 2005 IBM Corporation
+ * Interface implementation for communication with the v/VM control program
+ * Version 1.0
+ * Author(s): Christian Borntraeger <cborntra@de.ibm.com>
+ *
+ *
+ * z/VMs CP offers the possibility to issue commands via the diagnose code 8
+ * this driver implements a character device that issues these commands and
+ * returns the answer of CP.
+ *
+ * The idea of this driver is based on cpint from Neale Ferguson
+ */
+
+#include <asm/semaphore.h>
+#include <linux/ioctl.h>
+
+#define VMCP_GETCODE _IOR(0x10, 1, int)
+#define VMCP_SETBUF _IOW(0x10, 2, int)
+#define VMCP_GETSIZE _IOR(0x10, 3, int)
+
+struct vmcp_session {
+        unsigned int bufsize;
+        char *response;
+        int resp_size;
+        int resp_code;
+        /* As we use copy_from/to_user, which might     *
+         * sleep and cannot use a spinlock              */
+        struct semaphore mutex;
+};
diff --git a/drivers/s390/char/vmlogrdr.c b/drivers/s390/char/vmlogrdr.c
index f7717327d15e..491f00c032e8 100644
--- a/drivers/s390/char/vmlogrdr.c
+++ b/drivers/s390/char/vmlogrdr.c
@@ -236,7 +236,7 @@ vmlogrdr_get_recording_class_AB(void) {
         int len,i;
 
         printk (KERN_DEBUG "vmlogrdr: query command: %s\n", cp_command);
-        cpcmd(cp_command, cp_response, sizeof(cp_response));
+        cpcmd(cp_command, cp_response, sizeof(cp_response), NULL);
         printk (KERN_DEBUG "vmlogrdr: response: %s", cp_response);
         len = strnlen(cp_response,sizeof(cp_response));
         // now the parsing
@@ -288,7 +288,7 @@ vmlogrdr_recording(struct vmlogrdr_priv_t * logptr, int action, int purge) {
 
                 printk (KERN_DEBUG "vmlogrdr: recording command: %s\n",
                         cp_command);
-                cpcmd(cp_command, cp_response, sizeof(cp_response));
+                cpcmd(cp_command, cp_response, sizeof(cp_response), NULL);
                 printk (KERN_DEBUG "vmlogrdr: recording response: %s",
                         cp_response);
         }
@@ -301,7 +301,7 @@ vmlogrdr_recording(struct vmlogrdr_priv_t * logptr, int action, int purge) {
                 qid_string);
 
         printk (KERN_DEBUG "vmlogrdr: recording command: %s\n", cp_command);
-        cpcmd(cp_command, cp_response, sizeof(cp_response));
+        cpcmd(cp_command, cp_response, sizeof(cp_response), NULL);
         printk (KERN_DEBUG "vmlogrdr: recording response: %s",
                 cp_response);
         /* The recording command will usually answer with 'Command complete'
@@ -607,7 +607,7 @@ vmlogrdr_purge_store(struct device * dev, struct device_attribute *attr, const c
                          priv->recording_name);
 
         printk (KERN_DEBUG "vmlogrdr: recording command: %s\n", cp_command);
-        cpcmd(cp_command, cp_response, sizeof(cp_response));
+        cpcmd(cp_command, cp_response, sizeof(cp_response), NULL);
         printk (KERN_DEBUG "vmlogrdr: recording response: %s",
                 cp_response);
 
@@ -682,7 +682,7 @@ vmlogrdr_recording_status_show(struct device_driver *driver, char *buf) {
         char cp_command[] = "QUERY RECORDING ";
         int len;
 
-        cpcmd(cp_command, buf, 4096);
+        cpcmd(cp_command, buf, 4096, NULL);
         len = strlen(buf);
         return len;
 }
diff --git a/drivers/s390/cio/ccwgroup.c b/drivers/s390/cio/ccwgroup.c
index 306525acb9f8..91ea8e4777f3 100644
--- a/drivers/s390/cio/ccwgroup.c
+++ b/drivers/s390/cio/ccwgroup.c
@@ -403,34 +403,22 @@ ccwgroup_driver_register (struct ccwgroup_driver *cdriver)
         return driver_register(&cdriver->driver);
 }
 
-static inline struct device *
-__get_next_ccwgroup_device(struct device_driver *drv)
+static int
+__ccwgroup_driver_unregister_device(struct device *dev, void *data)
 {
-        struct device *dev, *d;
-
-        down_read(&drv->bus->subsys.rwsem);
-        dev = NULL;
-        list_for_each_entry(d, &drv->devices, driver_list) {
-                dev = get_device(d);
-                if (dev)
-                        break;
-        }
-        up_read(&drv->bus->subsys.rwsem);
-        return dev;
+        __ccwgroup_remove_symlinks(to_ccwgroupdev(dev));
+        device_unregister(dev);
+        put_device(dev);
+        return 0;
 }
 
 void
 ccwgroup_driver_unregister (struct ccwgroup_driver *cdriver)
 {
-        struct device *dev;
-
         /* We don't want ccwgroup devices to live longer than their driver. */
         get_driver(&cdriver->driver);
-        while ((dev = __get_next_ccwgroup_device(&cdriver->driver))) {
-                __ccwgroup_remove_symlinks(to_ccwgroupdev(dev));
-                device_unregister(dev);
-                put_device(dev);
-        };
+        driver_for_each_device(&cdriver->driver, NULL, NULL,
+                               __ccwgroup_driver_unregister_device);
         put_driver(&cdriver->driver);
         driver_unregister(&cdriver->driver);
 }
@@ -449,7 +437,7 @@ __ccwgroup_get_gdev_by_cdev(struct ccw_device *cdev)
         if (cdev->dev.driver_data) {
                 gdev = (struct ccwgroup_device *)cdev->dev.driver_data;
                 if (get_device(&gdev->dev)) {
-                        if (!list_empty(&gdev->dev.node))
+                        if (klist_node_attached(&gdev->dev.knode_bus))
                                 return gdev;
                         put_device(&gdev->dev);
                 }
diff --git a/drivers/s390/cio/cio.c b/drivers/s390/cio/cio.c
index 1d9b3f18d8de..ea813bdce1d6 100644
--- a/drivers/s390/cio/cio.c
+++ b/drivers/s390/cio/cio.c
@@ -1,7 +1,7 @@
 /*
  *  drivers/s390/cio/cio.c
  *   S/390 common I/O routines -- low level i/o calls
- *   $Revision: 1.133 $
+ *   $Revision: 1.134 $
  *
  *    Copyright (C) 1999-2002 IBM Deutschland Entwicklung GmbH,
  *                            IBM Corporation
@@ -63,17 +63,17 @@ __setup ("cio_msg=", cio_setup);
 static int __init
 cio_debug_init (void)
 {
-        cio_debug_msg_id = debug_register ("cio_msg", 4, 4, 16*sizeof (long));
+        cio_debug_msg_id = debug_register ("cio_msg", 16, 4, 16*sizeof (long));
         if (!cio_debug_msg_id)
                 goto out_unregister;
         debug_register_view (cio_debug_msg_id, &debug_sprintf_view);
         debug_set_level (cio_debug_msg_id, 2);
-        cio_debug_trace_id = debug_register ("cio_trace", 4, 4, 8);
+        cio_debug_trace_id = debug_register ("cio_trace", 16, 4, 8);
         if (!cio_debug_trace_id)
                 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", 2, 4, 16*sizeof (long));
+        cio_debug_crw_id = debug_register ("cio_crw", 4, 4, 16*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/cio/css.c b/drivers/s390/cio/css.c
index 87bd70eeabed..555119cacc27 100644
--- a/drivers/s390/cio/css.c
+++ b/drivers/s390/cio/css.c
@@ -128,34 +128,28 @@ css_probe_device(int irq)
         return ret;
 }
 
+static int
+check_subchannel(struct device * dev, void * data)
+{
+        struct subchannel *sch;
+        int irq = (unsigned long)data;
+
+        sch = to_subchannel(dev);
+        return (sch->irq == irq);
+}
+
 struct subchannel *
 get_subchannel_by_schid(int irq)
 {
-        struct subchannel *sch;
-        struct list_head *entry;
         struct device *dev;
 
-        if (!get_bus(&css_bus_type))
-                return NULL;
-        down_read(&css_bus_type.subsys.rwsem);
-        sch = NULL;
-        list_for_each(entry, &css_bus_type.devices.list) {
-                dev = get_device(container_of(entry,
-                                              struct device, bus_list));
-                if (!dev)
-                        continue;
-                sch = to_subchannel(dev);
-                if (sch->irq == irq)
-                        break;
-                put_device(dev);
-                sch = NULL;
-        }
-        up_read(&css_bus_type.subsys.rwsem);
-        put_bus(&css_bus_type);
+        dev = bus_find_device(&css_bus_type, NULL,
+                              (void *)(unsigned long)irq, check_subchannel);
 
-        return sch;
+        return dev ? to_subchannel(dev) : NULL;
 }
 
+
 static inline int
 css_get_subchannel_status(struct subchannel *sch, int schid)
 {
diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
index 809e1108a06e..14c76f5e4177 100644
--- a/drivers/s390/cio/device.c
+++ b/drivers/s390/cio/device.c
@@ -514,36 +514,39 @@ ccw_device_register(struct ccw_device *cdev)
         return ret;
 }
 
+struct match_data {
+        unsigned int  devno;
+        struct ccw_device * sibling;
+};
+
+static int
+match_devno(struct device * dev, void * data)
+{
+        struct match_data * d = (struct match_data *)data;
+        struct ccw_device * cdev;
+
+        cdev = to_ccwdev(dev);
+        if ((cdev->private->state == DEV_STATE_DISCONNECTED) &&
+            (cdev->private->devno == d->devno) &&
+            (cdev != d->sibling)) {
+                cdev->private->state = DEV_STATE_NOT_OPER;
+                return 1;
+        }
+        return 0;
+}
+
 static struct ccw_device *
 get_disc_ccwdev_by_devno(unsigned int devno, struct ccw_device *sibling)
 {
-        struct ccw_device *cdev;
-        struct list_head *entry;
         struct device *dev;
+        struct match_data data = {
+                .devno  = devno,
+                .sibling = sibling,
+        };
 
-        if (!get_bus(&ccw_bus_type))
-                return NULL;
-        down_read(&ccw_bus_type.subsys.rwsem);
-        cdev = NULL;
-        list_for_each(entry, &ccw_bus_type.devices.list) {
-                dev = get_device(container_of(entry,
-                                              struct device, bus_list));
-                if (!dev)
-                        continue;
-                cdev = to_ccwdev(dev);
-                if ((cdev->private->state == DEV_STATE_DISCONNECTED) &&
-                    (cdev->private->devno == devno) &&
-                    (cdev != sibling)) {
-                        cdev->private->state = DEV_STATE_NOT_OPER;
-                        break;
-                }
-                put_device(dev);
-                cdev = NULL;
-        }
-        up_read(&ccw_bus_type.subsys.rwsem);
-        put_bus(&ccw_bus_type);
+        dev = bus_find_device(&css_bus_type, NULL, &data, match_devno);
 
-        return cdev;
+        return dev ? to_ccwdev(dev) : NULL;
 }
 
 static void
@@ -647,7 +650,7 @@ io_subchannel_register(void *data)
         cdev = (struct ccw_device *) data;
         sch = to_subchannel(cdev->dev.parent);
 
-        if (!list_empty(&sch->dev.children)) {
+        if (klist_node_attached(&cdev->dev.knode_parent)) {
                 bus_rescan_devices(&ccw_bus_type);
                 goto out;
         }
@@ -1019,30 +1022,29 @@ ccw_device_probe_console(void)
 /*
  * get ccw_device matching the busid, but only if owned by cdrv
  */
+static int
+__ccwdev_check_busid(struct device *dev, void *id)
+{
+        char *bus_id;
+
+        bus_id = (char *)id;
+
+        return (strncmp(bus_id, dev->bus_id, BUS_ID_SIZE) == 0);
+}
+
+
 struct ccw_device *
 get_ccwdev_by_busid(struct ccw_driver *cdrv, const char *bus_id)
 {
-        struct device *d, *dev;
+        struct device *dev;
         struct device_driver *drv;
 
         drv = get_driver(&cdrv->driver);
         if (!drv)
-                return 0;
-
-        down_read(&drv->bus->subsys.rwsem);
-
-        dev = NULL;
-        list_for_each_entry(d, &drv->devices, driver_list) {
-                dev = get_device(d);
+                return NULL;
 
-                if (dev && !strncmp(bus_id, dev->bus_id, BUS_ID_SIZE))
-                        break;
-                else if (dev) {
-                        put_device(dev);
-                        dev = NULL;
-                }
-        }
-        up_read(&drv->bus->subsys.rwsem);
+        dev = driver_find_device(drv, NULL, (void *)bus_id,
+                                 __ccwdev_check_busid);
         put_driver(drv);
 
         return dev ? to_ccwdev(dev) : 0;
diff --git a/drivers/s390/cio/qdio.c b/drivers/s390/cio/qdio.c
index bbe9f45d1438..82194c4eadfb 100644
--- a/drivers/s390/cio/qdio.c
+++ b/drivers/s390/cio/qdio.c
@@ -56,7 +56,7 @@
 #include "ioasm.h"
 #include "chsc.h"
 
-#define VERSION_QDIO_C "$Revision: 1.98 $"
+#define VERSION_QDIO_C "$Revision: 1.101 $"
 
 /****************** MODULE PARAMETER VARIABLES ********************/
 MODULE_AUTHOR("Utz Bacher <utz.bacher@de.ibm.com>");
@@ -3342,7 +3342,7 @@ static int
 qdio_register_dbf_views(void)
 {
         qdio_dbf_setup=debug_register(QDIO_DBF_SETUP_NAME,
-                                      QDIO_DBF_SETUP_INDEX,
+                                      QDIO_DBF_SETUP_PAGES,
                                       QDIO_DBF_SETUP_NR_AREAS,
                                       QDIO_DBF_SETUP_LEN);
         if (!qdio_dbf_setup)
@@ -3351,7 +3351,7 @@ qdio_register_dbf_views(void)
         debug_set_level(qdio_dbf_setup,QDIO_DBF_SETUP_LEVEL);
 
         qdio_dbf_sbal=debug_register(QDIO_DBF_SBAL_NAME,
-                                     QDIO_DBF_SBAL_INDEX,
+                                     QDIO_DBF_SBAL_PAGES,
                                      QDIO_DBF_SBAL_NR_AREAS,
                                      QDIO_DBF_SBAL_LEN);
         if (!qdio_dbf_sbal)
@@ -3361,7 +3361,7 @@ qdio_register_dbf_views(void)
         debug_set_level(qdio_dbf_sbal,QDIO_DBF_SBAL_LEVEL);
 
         qdio_dbf_sense=debug_register(QDIO_DBF_SENSE_NAME,
-                                      QDIO_DBF_SENSE_INDEX,
+                                      QDIO_DBF_SENSE_PAGES,
                                       QDIO_DBF_SENSE_NR_AREAS,
                                       QDIO_DBF_SENSE_LEN);
         if (!qdio_dbf_sense)
@@ -3371,7 +3371,7 @@ qdio_register_dbf_views(void)
         debug_set_level(qdio_dbf_sense,QDIO_DBF_SENSE_LEVEL);
 
         qdio_dbf_trace=debug_register(QDIO_DBF_TRACE_NAME,
-                                      QDIO_DBF_TRACE_INDEX,
+                                      QDIO_DBF_TRACE_PAGES,
                                       QDIO_DBF_TRACE_NR_AREAS,
                                       QDIO_DBF_TRACE_LEN);
         if (!qdio_dbf_trace)
@@ -3382,7 +3382,7 @@ qdio_register_dbf_views(void)
 
 #ifdef CONFIG_QDIO_DEBUG
         qdio_dbf_slsb_out=debug_register(QDIO_DBF_SLSB_OUT_NAME,
-                                         QDIO_DBF_SLSB_OUT_INDEX,
+                                         QDIO_DBF_SLSB_OUT_PAGES,
                                          QDIO_DBF_SLSB_OUT_NR_AREAS,
                                          QDIO_DBF_SLSB_OUT_LEN);
         if (!qdio_dbf_slsb_out)
@@ -3391,7 +3391,7 @@ qdio_register_dbf_views(void)
         debug_set_level(qdio_dbf_slsb_out,QDIO_DBF_SLSB_OUT_LEVEL);
 
         qdio_dbf_slsb_in=debug_register(QDIO_DBF_SLSB_IN_NAME,
-                                        QDIO_DBF_SLSB_IN_INDEX,
+                                        QDIO_DBF_SLSB_IN_PAGES,
                                         QDIO_DBF_SLSB_IN_NR_AREAS,
                                         QDIO_DBF_SLSB_IN_LEN);
         if (!qdio_dbf_slsb_in)
diff --git a/drivers/s390/cio/qdio.h b/drivers/s390/cio/qdio.h
index b6daadac4e8b..6b8aa6a852be 100644
--- a/drivers/s390/cio/qdio.h
+++ b/drivers/s390/cio/qdio.h
@@ -3,7 +3,7 @@
 
 #include <asm/page.h>
 
-#define VERSION_CIO_QDIO_H "$Revision: 1.32 $"
+#define VERSION_CIO_QDIO_H "$Revision: 1.33 $"
 
 #ifdef CONFIG_QDIO_DEBUG
 #define QDIO_VERBOSE_LEVEL 9
@@ -132,7 +132,7 @@ enum qdio_irq_states {
 
 #define QDIO_DBF_SETUP_NAME "qdio_setup"
 #define QDIO_DBF_SETUP_LEN 8
-#define QDIO_DBF_SETUP_INDEX 2
+#define QDIO_DBF_SETUP_PAGES 4
 #define QDIO_DBF_SETUP_NR_AREAS 1
 #ifdef CONFIG_QDIO_DEBUG
 #define QDIO_DBF_SETUP_LEVEL 6
@@ -142,7 +142,7 @@ enum qdio_irq_states {
 
 #define QDIO_DBF_SBAL_NAME "qdio_labs" /* sbal */
 #define QDIO_DBF_SBAL_LEN 256
-#define QDIO_DBF_SBAL_INDEX 2
+#define QDIO_DBF_SBAL_PAGES 4
 #define QDIO_DBF_SBAL_NR_AREAS 2
 #ifdef CONFIG_QDIO_DEBUG
 #define QDIO_DBF_SBAL_LEVEL 6
@@ -154,16 +154,16 @@ enum qdio_irq_states {
 #define QDIO_DBF_TRACE_LEN 8
 #define QDIO_DBF_TRACE_NR_AREAS 2
 #ifdef CONFIG_QDIO_DEBUG
-#define QDIO_DBF_TRACE_INDEX 4
+#define QDIO_DBF_TRACE_PAGES 16
 #define QDIO_DBF_TRACE_LEVEL 4 /* -------- could be even more verbose here */
 #else /* CONFIG_QDIO_DEBUG */
-#define QDIO_DBF_TRACE_INDEX 2
+#define QDIO_DBF_TRACE_PAGES 4
 #define QDIO_DBF_TRACE_LEVEL 2
 #endif /* CONFIG_QDIO_DEBUG */
 
 #define QDIO_DBF_SENSE_NAME "qdio_sense"
 #define QDIO_DBF_SENSE_LEN 64
-#define QDIO_DBF_SENSE_INDEX 1
+#define QDIO_DBF_SENSE_PAGES 2
 #define QDIO_DBF_SENSE_NR_AREAS 1
 #ifdef CONFIG_QDIO_DEBUG
 #define QDIO_DBF_SENSE_LEVEL 6
@@ -176,13 +176,13 @@ enum qdio_irq_states {
 
 #define QDIO_DBF_SLSB_OUT_NAME "qdio_slsb_out"
 #define QDIO_DBF_SLSB_OUT_LEN QDIO_MAX_BUFFERS_PER_Q
-#define QDIO_DBF_SLSB_OUT_INDEX 8
+#define QDIO_DBF_SLSB_OUT_PAGES 256
 #define QDIO_DBF_SLSB_OUT_NR_AREAS 1
 #define QDIO_DBF_SLSB_OUT_LEVEL 6
 
 #define QDIO_DBF_SLSB_IN_NAME "qdio_slsb_in"
 #define QDIO_DBF_SLSB_IN_LEN QDIO_MAX_BUFFERS_PER_Q
-#define QDIO_DBF_SLSB_IN_INDEX 8
+#define QDIO_DBF_SLSB_IN_PAGES 256
 #define QDIO_DBF_SLSB_IN_NR_AREAS 1
 #define QDIO_DBF_SLSB_IN_LEVEL 6
 #endif /* CONFIG_QDIO_DEBUG */
diff --git a/drivers/s390/net/claw.c b/drivers/s390/net/claw.c
index a99927d54ebb..60440dbe3a27 100644
--- a/drivers/s390/net/claw.c
+++ b/drivers/s390/net/claw.c
@@ -146,8 +146,8 @@ claw_unregister_debug_facility(void)
 static int
 claw_register_debug_facility(void)
 {
-        claw_dbf_setup = debug_register("claw_setup", 1, 1, 8);
-        claw_dbf_trace = debug_register("claw_trace", 1, 2, 8);
+        claw_dbf_setup = debug_register("claw_setup", 2, 1, 8);
+        claw_dbf_trace = debug_register("claw_trace", 2, 2, 8);
         if (claw_dbf_setup == NULL || claw_dbf_trace == NULL) {
                 printk(KERN_WARNING "Not enough memory for debug facility.\n");
                 claw_unregister_debug_facility();
diff --git a/drivers/s390/net/ctcdbug.c b/drivers/s390/net/ctcdbug.c
index 2c86bfa11b2f..0e2a8bb93032 100644
--- a/drivers/s390/net/ctcdbug.c
+++ b/drivers/s390/net/ctcdbug.c
@@ -1,6 +1,6 @@
 /*
  *
- * linux/drivers/s390/net/ctcdbug.c ($Revision: 1.4 $)
+ * linux/drivers/s390/net/ctcdbug.c ($Revision: 1.6 $)
  *
  * CTC / ESCON network driver - s390 dbf exploit.
  *
@@ -9,7 +9,7 @@
  *    Author(s): Original Code written by
  *                        Peter Tiedemann (ptiedem@de.ibm.com)
  *
- *    $Revision: 1.4 $   $Date: 2004/08/04 10:11:59 $
+ *    $Revision: 1.6 $   $Date: 2005/05/11 08:10:17 $
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -51,15 +51,15 @@ int
 ctc_register_dbf_views(void)
 {
         ctc_dbf_setup = debug_register(CTC_DBF_SETUP_NAME,
-                                        CTC_DBF_SETUP_INDEX,
+                                        CTC_DBF_SETUP_PAGES,
                                         CTC_DBF_SETUP_NR_AREAS,
                                         CTC_DBF_SETUP_LEN);
         ctc_dbf_data = debug_register(CTC_DBF_DATA_NAME,
-                                       CTC_DBF_DATA_INDEX,
+                                       CTC_DBF_DATA_PAGES,
                                        CTC_DBF_DATA_NR_AREAS,
                                        CTC_DBF_DATA_LEN);
         ctc_dbf_trace = debug_register(CTC_DBF_TRACE_NAME,
-                                        CTC_DBF_TRACE_INDEX,
+                                        CTC_DBF_TRACE_PAGES,
                                         CTC_DBF_TRACE_NR_AREAS,
                                         CTC_DBF_TRACE_LEN);
 
diff --git a/drivers/s390/net/ctcdbug.h b/drivers/s390/net/ctcdbug.h
index 7fe2ebd1792d..7d6afa1627c3 100644
--- a/drivers/s390/net/ctcdbug.h
+++ b/drivers/s390/net/ctcdbug.h
@@ -1,6 +1,6 @@
 /*
  *
- * linux/drivers/s390/net/ctcdbug.h ($Revision: 1.5 $)
+ * linux/drivers/s390/net/ctcdbug.h ($Revision: 1.6 $)
  *
  * CTC / ESCON network driver - s390 dbf exploit.
  *
@@ -9,7 +9,7 @@
  *    Author(s): Original Code written by
  *                        Peter Tiedemann (ptiedem@de.ibm.com)
  *
- *    $Revision: 1.5 $   $Date: 2005/02/27 19:46:44 $
+ *    $Revision: 1.6 $   $Date: 2005/05/11 08:10:17 $
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -35,19 +35,19 @@
  */
 #define CTC_DBF_SETUP_NAME "ctc_setup"
 #define CTC_DBF_SETUP_LEN 16
-#define CTC_DBF_SETUP_INDEX 3
+#define CTC_DBF_SETUP_PAGES 8
 #define CTC_DBF_SETUP_NR_AREAS 1
 #define CTC_DBF_SETUP_LEVEL 3
 
 #define CTC_DBF_DATA_NAME "ctc_data"
 #define CTC_DBF_DATA_LEN 128
-#define CTC_DBF_DATA_INDEX 3
+#define CTC_DBF_DATA_PAGES 8
 #define CTC_DBF_DATA_NR_AREAS 1
 #define CTC_DBF_DATA_LEVEL 3
 
 #define CTC_DBF_TRACE_NAME "ctc_trace"
 #define CTC_DBF_TRACE_LEN 16
-#define CTC_DBF_TRACE_INDEX 2
+#define CTC_DBF_TRACE_PAGES 4
 #define CTC_DBF_TRACE_NR_AREAS 2
 #define CTC_DBF_TRACE_LEVEL 3
 
diff --git a/drivers/s390/net/iucv.h b/drivers/s390/net/iucv.h
index 198330217eff..0c4644d3d2f3 100644
--- a/drivers/s390/net/iucv.h
+++ b/drivers/s390/net/iucv.h
@@ -37,19 +37,19 @@
  */
 #define IUCV_DBF_SETUP_NAME "iucv_setup"
 #define IUCV_DBF_SETUP_LEN 32
-#define IUCV_DBF_SETUP_INDEX 1
+#define IUCV_DBF_SETUP_PAGES 2
 #define IUCV_DBF_SETUP_NR_AREAS 1
 #define IUCV_DBF_SETUP_LEVEL 3
 
 #define IUCV_DBF_DATA_NAME "iucv_data"
 #define IUCV_DBF_DATA_LEN 128
-#define IUCV_DBF_DATA_INDEX 1
+#define IUCV_DBF_DATA_PAGES 2
 #define IUCV_DBF_DATA_NR_AREAS 1
 #define IUCV_DBF_DATA_LEVEL 2
 
 #define IUCV_DBF_TRACE_NAME "iucv_trace"
 #define IUCV_DBF_TRACE_LEN 16
-#define IUCV_DBF_TRACE_INDEX 2
+#define IUCV_DBF_TRACE_PAGES 4
 #define IUCV_DBF_TRACE_NR_AREAS 1
 #define IUCV_DBF_TRACE_LEVEL 3
 
diff --git a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c
index ab086242d305..46f34ba93ac5 100644
--- a/drivers/s390/net/lcs.c
+++ b/drivers/s390/net/lcs.c
@@ -11,7 +11,7 @@
  *                        Frank Pavlic (pavlic@de.ibm.com) and
  *                        Martin Schwidefsky <schwidefsky@de.ibm.com>
  *
- *    $Revision: 1.98 $  $Date: 2005/04/18 13:41:29 $
+ *    $Revision: 1.99 $  $Date: 2005/05/11 08:10:17 $
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -59,7 +59,7 @@
 /**
  * initialization string for output
  */
-#define VERSION_LCS_C  "$Revision: 1.98 $"
+#define VERSION_LCS_C  "$Revision: 1.99 $"
 
 static char version[] __initdata = "LCS driver ("VERSION_LCS_C "/" VERSION_LCS_H ")";
 static char debug_buffer[255];
@@ -93,8 +93,8 @@ lcs_unregister_debug_facility(void)
 static int
 lcs_register_debug_facility(void)
 {
-        lcs_dbf_setup = debug_register("lcs_setup", 1, 1, 8);
-        lcs_dbf_trace = debug_register("lcs_trace", 1, 2, 8);
+        lcs_dbf_setup = debug_register("lcs_setup", 2, 1, 8);
+        lcs_dbf_trace = debug_register("lcs_trace", 2, 2, 8);
         if (lcs_dbf_setup == NULL || lcs_dbf_trace == NULL) {
                 PRINT_ERR("Not enough memory for debug facility.\n");
                 lcs_unregister_debug_facility();
diff --git a/drivers/s390/net/netiucv.c b/drivers/s390/net/netiucv.c
index 3fd4fb754b2d..69425a7a6e98 100644
--- a/drivers/s390/net/netiucv.c
+++ b/drivers/s390/net/netiucv.c
@@ -1,5 +1,5 @@
 /*
- * $Id: netiucv.c,v 1.63 2004/07/27 13:36:05 mschwide Exp $
+ * $Id: netiucv.c,v 1.66 2005/05/11 08:10:17 holzheu Exp $
  *
  * IUCV network driver
  *
@@ -30,7 +30,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * RELEASE-TAG: IUCV network driver $Revision: 1.63 $
+ * RELEASE-TAG: IUCV network driver $Revision: 1.66 $
  *
  */
 
@@ -391,15 +391,15 @@ static int
 iucv_register_dbf_views(void)
 {
         iucv_dbf_setup = debug_register(IUCV_DBF_SETUP_NAME,
-                                        IUCV_DBF_SETUP_INDEX,
+                                        IUCV_DBF_SETUP_PAGES,
                                         IUCV_DBF_SETUP_NR_AREAS,
                                         IUCV_DBF_SETUP_LEN);
         iucv_dbf_data = debug_register(IUCV_DBF_DATA_NAME,
-                                       IUCV_DBF_DATA_INDEX,
+                                       IUCV_DBF_DATA_PAGES,
                                        IUCV_DBF_DATA_NR_AREAS,
                                        IUCV_DBF_DATA_LEN);
         iucv_dbf_trace = debug_register(IUCV_DBF_TRACE_NAME,
-                                        IUCV_DBF_TRACE_INDEX,
+                                        IUCV_DBF_TRACE_PAGES,
                                         IUCV_DBF_TRACE_NR_AREAS,
                                         IUCV_DBF_TRACE_LEN);
 
@@ -2076,7 +2076,7 @@ DRIVER_ATTR(remove, 0200, NULL, remove_write);
 static void
 netiucv_banner(void)
 {
-        char vbuf[] = "$Revision: 1.63 $";
+        char vbuf[] = "$Revision: 1.66 $";
         char *version = vbuf;
 
         if ((version = strchr(version, ':'))) {
diff --git a/drivers/s390/net/qeth.h b/drivers/s390/net/qeth.h
index a755b57db46b..008e0a5d2eb3 100644
--- a/drivers/s390/net/qeth.h
+++ b/drivers/s390/net/qeth.h
@@ -42,44 +42,44 @@
  */
 #define QETH_DBF_SETUP_NAME "qeth_setup"
 #define QETH_DBF_SETUP_LEN 8
-#define QETH_DBF_SETUP_INDEX 3
+#define QETH_DBF_SETUP_PAGES 8
 #define QETH_DBF_SETUP_NR_AREAS 1
 #define QETH_DBF_SETUP_LEVEL 5
 
 #define QETH_DBF_MISC_NAME "qeth_misc"
 #define QETH_DBF_MISC_LEN 128
-#define QETH_DBF_MISC_INDEX 1
+#define QETH_DBF_MISC_PAGES 2
 #define QETH_DBF_MISC_NR_AREAS 1
 #define QETH_DBF_MISC_LEVEL 2
 
 #define QETH_DBF_DATA_NAME "qeth_data"
 #define QETH_DBF_DATA_LEN 96
-#define QETH_DBF_DATA_INDEX 3
+#define QETH_DBF_DATA_PAGES 8
 #define QETH_DBF_DATA_NR_AREAS 1
 #define QETH_DBF_DATA_LEVEL 2
 
 #define QETH_DBF_CONTROL_NAME "qeth_control"
 #define QETH_DBF_CONTROL_LEN 256
-#define QETH_DBF_CONTROL_INDEX 3
+#define QETH_DBF_CONTROL_PAGES 8
 #define QETH_DBF_CONTROL_NR_AREAS 2
 #define QETH_DBF_CONTROL_LEVEL 5
 
 #define QETH_DBF_TRACE_NAME "qeth_trace"
 #define QETH_DBF_TRACE_LEN 8
-#define QETH_DBF_TRACE_INDEX 2
+#define QETH_DBF_TRACE_PAGES 4
 #define QETH_DBF_TRACE_NR_AREAS 2
 #define QETH_DBF_TRACE_LEVEL 3
 extern debug_info_t *qeth_dbf_trace;
 
 #define QETH_DBF_SENSE_NAME "qeth_sense"
 #define QETH_DBF_SENSE_LEN 64
-#define QETH_DBF_SENSE_INDEX 1
+#define QETH_DBF_SENSE_PAGES 2
 #define QETH_DBF_SENSE_NR_AREAS 1
 #define QETH_DBF_SENSE_LEVEL 2
 
 #define QETH_DBF_QERR_NAME "qeth_qerr"
 #define QETH_DBF_QERR_LEN 8
-#define QETH_DBF_QERR_INDEX 1
+#define QETH_DBF_QERR_PAGES 2
 #define QETH_DBF_QERR_NR_AREAS 2
 #define QETH_DBF_QERR_LEVEL 2
 
diff --git a/drivers/s390/net/qeth_main.c b/drivers/s390/net/qeth_main.c
index 208127a5033a..3cb88c770037 100644
--- a/drivers/s390/net/qeth_main.c
+++ b/drivers/s390/net/qeth_main.c
@@ -7639,31 +7639,31 @@ static int
 qeth_register_dbf_views(void)
 {
         qeth_dbf_setup = debug_register(QETH_DBF_SETUP_NAME,
-                                        QETH_DBF_SETUP_INDEX,
+                                        QETH_DBF_SETUP_PAGES,
                                         QETH_DBF_SETUP_NR_AREAS,
                                         QETH_DBF_SETUP_LEN);
         qeth_dbf_misc = debug_register(QETH_DBF_MISC_NAME,
-                                       QETH_DBF_MISC_INDEX,
+                                       QETH_DBF_MISC_PAGES,
                                        QETH_DBF_MISC_NR_AREAS,
                                        QETH_DBF_MISC_LEN);
         qeth_dbf_data = debug_register(QETH_DBF_DATA_NAME,
-                                       QETH_DBF_DATA_INDEX,
+                                       QETH_DBF_DATA_PAGES,
                                        QETH_DBF_DATA_NR_AREAS,
                                        QETH_DBF_DATA_LEN);
         qeth_dbf_control = debug_register(QETH_DBF_CONTROL_NAME,
-                                          QETH_DBF_CONTROL_INDEX,
+                                          QETH_DBF_CONTROL_PAGES,
                                           QETH_DBF_CONTROL_NR_AREAS,
                                           QETH_DBF_CONTROL_LEN);
         qeth_dbf_sense = debug_register(QETH_DBF_SENSE_NAME,
-                                        QETH_DBF_SENSE_INDEX,
+                                        QETH_DBF_SENSE_PAGES,
                                         QETH_DBF_SENSE_NR_AREAS,
                                         QETH_DBF_SENSE_LEN);
         qeth_dbf_qerr = debug_register(QETH_DBF_QERR_NAME,
-                                       QETH_DBF_QERR_INDEX,
+                                       QETH_DBF_QERR_PAGES,
                                        QETH_DBF_QERR_NR_AREAS,
                                        QETH_DBF_QERR_LEN);
         qeth_dbf_trace = debug_register(QETH_DBF_TRACE_NAME,
-                                        QETH_DBF_TRACE_INDEX,
+                                        QETH_DBF_TRACE_PAGES,
                                         QETH_DBF_TRACE_NR_AREAS,
                                         QETH_DBF_TRACE_LEN);
 
diff --git a/drivers/s390/net/smsgiucv.c b/drivers/s390/net/smsgiucv.c
index 1e3f7f3c662f..d6469baa7e16 100644
--- a/drivers/s390/net/smsgiucv.c
+++ b/drivers/s390/net/smsgiucv.c
@@ -138,7 +138,7 @@ static void __exit
 smsg_exit(void)
 {
         if (smsg_handle > 0) {
-                cpcmd("SET SMSG OFF", 0, 0);
+                cpcmd("SET SMSG OFF", NULL, 0, NULL);
                 iucv_sever(smsg_pathid, 0);
                 iucv_unregister_program(smsg_handle);
                 driver_unregister(&smsg_driver);
@@ -177,7 +177,7 @@ smsg_init(void)
                 smsg_handle = 0;
                 return -EIO;
         }
-        cpcmd("SET SMSG IUCV", 0, 0);
+        cpcmd("SET SMSG IUCV", NULL, 0, NULL);
         return 0;
 }
 
diff --git a/drivers/s390/s390mach.c b/drivers/s390/s390mach.c
index ffa996c8a908..5bb255e02acc 100644
--- a/drivers/s390/s390mach.c
+++ b/drivers/s390/s390mach.c
@@ -31,14 +31,14 @@ extern void css_reiterate_subchannels(void);
 extern struct workqueue_struct *slow_path_wq;
 extern struct work_struct slow_path_work;
 
-static void
+static NORET_TYPE void
 s390_handle_damage(char *msg)
 {
-        printk(KERN_EMERG "%s\n", msg);
 #ifdef CONFIG_SMP
         smp_send_stop();
 #endif
         disabled_wait((unsigned long) __builtin_return_address(0));
+        for(;;);
 }
 
 /*
@@ -122,40 +122,39 @@ repeat:
         return 0;
 }
 
+struct mcck_struct {
+        int kill_task;
+        int channel_report;
+        int warning;
+        unsigned long long mcck_code;
+};
+
+static DEFINE_PER_CPU(struct mcck_struct, cpu_mcck);
+
 /*
- * machine check handler.
+ * Main machine check handler function. Will be called with interrupts enabled
+ * or disabled and machine checks enabled or disabled.
  */
 void
-s390_do_machine_check(void)
+s390_handle_mcck(void)
 {
-        struct mci *mci;
-
-        mci = (struct mci *) &S390_lowcore.mcck_interruption_code;
+        unsigned long flags;
+        struct mcck_struct mcck;
 
-        if (mci->sd)            /* system damage */
-                s390_handle_damage("received system damage machine check\n");
+        /*
+         * Disable machine checks and get the current state of accumulated
+         * machine checks. Afterwards delete the old state and enable machine
+         * checks again.
+         */
+        local_irq_save(flags);
+        local_mcck_disable();
+        mcck = __get_cpu_var(cpu_mcck);
+        memset(&__get_cpu_var(cpu_mcck), 0, sizeof(struct mcck_struct));
+        clear_thread_flag(TIF_MCCK_PENDING);
+        local_mcck_enable();
+        local_irq_restore(flags);
 
-        if (mci->pd)            /* instruction processing damage */
-                s390_handle_damage("received instruction processing "
-                                   "damage machine check\n");
-
-        if (mci->se)            /* storage error uncorrected */
-                s390_handle_damage("received storage error uncorrected "
-                                   "machine check\n");
-
-        if (mci->sc)            /* storage error corrected */
-                printk(KERN_WARNING
-                       "received storage error corrected machine check\n");
-
-        if (mci->ke)            /* storage key-error uncorrected */
-                s390_handle_damage("received storage key-error uncorrected "
-                                   "machine check\n");
-
-        if (mci->ds && mci->fa) /* storage degradation */
-                s390_handle_damage("received storage degradation machine "
-                                   "check\n");
-
-        if (mci->cp)            /* channel report word pending */
+        if (mcck.channel_report)
                 up(&m_sem);
 
 #ifdef CONFIG_MACHCHK_WARNING
@@ -168,7 +167,7 @@ s390_do_machine_check(void)
  * On VM we only get one interrupt per virtally presented machinecheck.
  * Though one suffices, we may get one interrupt per (virtual) processor.
  */
-        if (mci->w) {   /* WARNING pending ? */
+        if (mcck.warning) {     /* WARNING pending ? */
                 static int mchchk_wng_posted = 0;
                 /*
                  * Use single machine clear, as we cannot handle smp right now
@@ -178,6 +177,261 @@ s390_do_machine_check(void)
                         kill_proc(1, SIGPWR, 1);
         }
 #endif
+
+        if (mcck.kill_task) {
+                local_irq_enable();
+                printk(KERN_EMERG "mcck: Terminating task because of machine "
+                       "malfunction (code 0x%016llx).\n", mcck.mcck_code);
+                printk(KERN_EMERG "mcck: task: %s, pid: %d.\n",
+                       current->comm, current->pid);
+                do_exit(SIGSEGV);
+        }
+}
+
+/*
+ * returns 0 if all registers could be validated
+ * returns 1 otherwise
+ */
+static int
+s390_revalidate_registers(struct mci *mci)
+{
+        int kill_task;
+        u64 tmpclock;
+        u64 zero;
+        void *fpt_save_area, *fpt_creg_save_area;
+
+        kill_task = 0;
+        zero = 0;
+        /* General purpose registers */
+        if (!mci->gr)
+                /*
+                 * General purpose registers couldn't be restored and have
+                 * unknown contents. Process needs to be terminated.
+                 */
+                kill_task = 1;
+
+        /* Revalidate floating point registers */
+        if (!mci->fp)
+                /*
+                 * Floating point registers can't be restored and
+                 * therefore the process needs to be terminated.
+                 */
+                kill_task = 1;
+
+#ifndef __s390x__
+        asm volatile("ld 0,0(%0)\n"
+                     "ld 2,8(%0)\n"
+                     "ld 4,16(%0)\n"
+                     "ld 6,24(%0)"
+                     : : "a" (&S390_lowcore.floating_pt_save_area));
+#endif
+
+        if (MACHINE_HAS_IEEE) {
+#ifdef __s390x__
+                fpt_save_area = &S390_lowcore.floating_pt_save_area;
+                fpt_creg_save_area = &S390_lowcore.fpt_creg_save_area;
+#else
+                fpt_save_area = (void *) S390_lowcore.extended_save_area_addr;
+                fpt_creg_save_area = fpt_save_area+128;
+#endif
+                /* Floating point control register */
+                if (!mci->fc) {
+                        /*
+                         * Floating point control register can't be restored.
+                         * Task will be terminated.
+                         */
+                        asm volatile ("lfpc 0(%0)" : : "a" (&zero));
+                        kill_task = 1;
+
+                }
+                else
+                        asm volatile (
+                                "lfpc 0(%0)"
+                                : : "a" (fpt_creg_save_area));
+
+                asm volatile("ld  0,0(%0)\n"
+                             "ld  1,8(%0)\n"
+                             "ld  2,16(%0)\n"
+                             "ld  3,24(%0)\n"
+                             "ld  4,32(%0)\n"
+                             "ld  5,40(%0)\n"
+                             "ld  6,48(%0)\n"
+                             "ld  7,56(%0)\n"
+                             "ld  8,64(%0)\n"
+                             "ld  9,72(%0)\n"
+                             "ld 10,80(%0)\n"
+                             "ld 11,88(%0)\n"
+                             "ld 12,96(%0)\n"
+                             "ld 13,104(%0)\n"
+                             "ld 14,112(%0)\n"
+                             "ld 15,120(%0)\n"
+                             : : "a" (fpt_save_area));
+        }
+
+        /* Revalidate access registers */
+        asm volatile("lam 0,15,0(%0)"
+                     : : "a" (&S390_lowcore.access_regs_save_area));
+        if (!mci->ar)
+                /*
+                 * Access registers have unknown contents.
+                 * Terminating task.
+                 */
+                kill_task = 1;
+
+        /* Revalidate control registers */
+        if (!mci->cr)
+                /*
+                 * Control registers have unknown contents.
+                 * Can't recover and therefore stopping machine.
+                 */
+                s390_handle_damage("invalid control registers.");
+        else
+#ifdef __s390x__
+                asm volatile("lctlg 0,15,0(%0)"
+                             : : "a" (&S390_lowcore.cregs_save_area));
+#else
+                asm volatile("lctl 0,15,0(%0)"
+                             : : "a" (&S390_lowcore.cregs_save_area));
+#endif
+
+        /*
+         * We don't even try to revalidate the TOD register, since we simply
+         * can't write something sensible into that register.
+         */
+
+#ifdef __s390x__
+        /*
+         * See if we can revalidate the TOD programmable register with its
+         * old contents (should be zero) otherwise set it to zero.
+         */
+        if (!mci->pr)
+                asm volatile("sr 0,0\n"
+                             "sckpf"
+                             : : : "0", "cc");
+        else
+                asm volatile(
+                        "l 0,0(%0)\n"
+                        "sckpf"
+                        : : "a" (&S390_lowcore.tod_progreg_save_area) : "0", "cc");
+#endif
+
+        /* Revalidate clock comparator register */
+        asm volatile ("stck 0(%1)\n"
+                      "sckc 0(%1)"
+                      : "=m" (tmpclock) : "a" (&(tmpclock)) : "cc", "memory");
+
+        /* Check if old PSW is valid */
+        if (!mci->wp)
+                /*
+                 * Can't tell if we come from user or kernel mode
+                 * -> stopping machine.
+                 */
+                s390_handle_damage("old psw invalid.");
+
+        if (!mci->ms || !mci->pm || !mci->ia)
+                kill_task = 1;
+
+        return kill_task;
+}
+
+/*
+ * machine check handler.
+ */
+void
+s390_do_machine_check(struct pt_regs *regs)
+{
+        struct mci *mci;
+        struct mcck_struct *mcck;
+        int umode;
+
+        mci = (struct mci *) &S390_lowcore.mcck_interruption_code;
+        mcck = &__get_cpu_var(cpu_mcck);
+        umode = user_mode(regs);
+
+        if (mci->sd)
+                /* System damage -> stopping machine */
+                s390_handle_damage("received system damage machine check.");
+
+        if (mci->pd) {
+                if (mci->b) {
+                        /* Processing backup -> verify if we can survive this */
+                        u64 z_mcic, o_mcic, t_mcic;
+#ifdef __s390x__
+                        z_mcic = (1ULL<<63 | 1ULL<<59 | 1ULL<<29);
+                        o_mcic = (1ULL<<43 | 1ULL<<42 | 1ULL<<41 | 1ULL<<40 |
+                                  1ULL<<36 | 1ULL<<35 | 1ULL<<34 | 1ULL<<32 |
+                                  1ULL<<30 | 1ULL<<21 | 1ULL<<20 | 1ULL<<17 |
+                                  1ULL<<16);
+#else
+                        z_mcic = (1ULL<<63 | 1ULL<<59 | 1ULL<<57 | 1ULL<<50 |
+                                  1ULL<<29);
+                        o_mcic = (1ULL<<43 | 1ULL<<42 | 1ULL<<41 | 1ULL<<40 |
+                                  1ULL<<36 | 1ULL<<35 | 1ULL<<34 | 1ULL<<32 |
+                                  1ULL<<30 | 1ULL<<20 | 1ULL<<17 | 1ULL<<16);
+#endif
+                        t_mcic = *(u64 *)mci;
+
+                        if (((t_mcic & z_mcic) != 0) ||
+                            ((t_mcic & o_mcic) != o_mcic)) {
+                                s390_handle_damage("processing backup machine "
+                                                   "check with damage.");
+                        }
+                        if (!umode)
+                                s390_handle_damage("processing backup machine "
+                                                   "check in kernel mode.");
+                        mcck->kill_task = 1;
+                        mcck->mcck_code = *(unsigned long long *) mci;
+                }
+                else {
+                        /* Processing damage -> stopping machine */
+                        s390_handle_damage("received instruction processing "
+                                           "damage machine check.");
+                }
+        }
+        if (s390_revalidate_registers(mci)) {
+                if (umode) {
+                        /*
+                         * Couldn't restore all register contents while in
+                         * user mode -> mark task for termination.
+                         */
+                        mcck->kill_task = 1;
+                        mcck->mcck_code = *(unsigned long long *) mci;
+                        set_thread_flag(TIF_MCCK_PENDING);
+                }
+                else
+                        /*
+                         * Couldn't restore all register contents while in
+                         * kernel mode -> stopping machine.
+                         */
+                        s390_handle_damage("unable to revalidate registers.");
+        }
+
+        if (mci->se)
+                /* Storage error uncorrected */
+                s390_handle_damage("received storage error uncorrected "
+                                   "machine check.");
+
+        if (mci->ke)
+                /* Storage key-error uncorrected */
+                s390_handle_damage("received storage key-error uncorrected "
+                                   "machine check.");
+
+        if (mci->ds && mci->fa)
+                /* Storage degradation */
+                s390_handle_damage("received storage degradation machine "
+                                   "check.");
+
+        if (mci->cp) {
+                /* Channel report word pending */
+                mcck->channel_report = 1;
+                set_thread_flag(TIF_MCCK_PENDING);
+        }
+
+        if (mci->w) {
+                /* Warning pending */
+                mcck->warning = 1;
+                set_thread_flag(TIF_MCCK_PENDING);
+        }
 }
 
 /*
@@ -189,9 +443,8 @@ static int
 machine_check_init(void)
 {
         init_MUTEX_LOCKED(&m_sem);
-        ctl_clear_bit(14, 25);  /* disable damage MCH */
-        ctl_set_bit(14, 26);    /* enable degradation MCH */
-        ctl_set_bit(14, 27);    /* enable system recovery MCH */
+        ctl_clear_bit(14, 25);  /* disable external damage MCH */
+        ctl_set_bit(14, 27);    /* enable system recovery MCH */
 #ifdef CONFIG_MACHCHK_WARNING
         ctl_set_bit(14, 24);    /* enable warning MCH */
 #endif
diff --git a/drivers/s390/s390mach.h b/drivers/s390/s390mach.h
index 7e26f0f1b0dc..4eaa70179182 100644
--- a/drivers/s390/s390mach.h
+++ b/drivers/s390/s390mach.h
@@ -16,20 +16,45 @@ struct mci {
         __u32   sd              :  1; /* 00 system damage */
         __u32   pd              :  1; /* 01 instruction-processing damage */
         __u32   sr              :  1; /* 02 system recovery */
-        __u32   to_be_defined_1 :  4; /* 03-06 */
+        __u32   to_be_defined_1 :  1; /* 03 */
+        __u32   cd              :  1; /* 04 timing-facility damage */
+        __u32   ed              :  1; /* 05 external damage */
+        __u32   to_be_defined_2 :  1; /* 06 */
         __u32   dg              :  1; /* 07 degradation */
         __u32   w               :  1; /* 08 warning pending */
         __u32   cp              :  1; /* 09 channel-report pending */
-        __u32   to_be_defined_2 :  6; /* 10-15 */
+        __u32   sp              :  1; /* 10 service-processor damage */
+        __u32   ck              :  1; /* 11 channel-subsystem damage */
+        __u32   to_be_defined_3 :  2; /* 12-13 */
+        __u32   b               :  1; /* 14 backed up */
+        __u32   to_be_defined_4 :  1; /* 15 */
         __u32   se              :  1; /* 16 storage error uncorrected */
         __u32   sc              :  1; /* 17 storage error corrected */
         __u32   ke              :  1; /* 18 storage-key error uncorrected */
         __u32   ds              :  1; /* 19 storage degradation */
-        __u32   to_be_defined_3 :  4; /* 20-23 */
+        __u32   wp              :  1; /* 20 psw mwp validity */
+        __u32   ms              :  1; /* 21 psw mask and key validity */
+        __u32   pm              :  1; /* 22 psw program mask and cc validity */
+        __u32   ia              :  1; /* 23 psw instruction address validity */
         __u32   fa              :  1; /* 24 failing storage address validity */
-        __u32   to_be_defined_4 :  7; /* 25-31 */
+        __u32   to_be_defined_5 :  1; /* 25 */
+        __u32   ec              :  1; /* 26 external damage code validity */
+        __u32   fp              :  1; /* 27 floating point register validity */
+        __u32   gr              :  1; /* 28 general register validity */
+        __u32   cr              :  1; /* 29 control register validity */
+        __u32   to_be_defined_6 :  1; /* 30 */
+        __u32   st              :  1; /* 31 storage logical validity */
         __u32   ie              :  1; /* 32 indirect storage error */
-        __u32   to_be_defined_5 : 31; /* 33-63 */
+        __u32   ar              :  1; /* 33 access register validity */
+        __u32   da              :  1; /* 34 delayed access exception */
+        __u32   to_be_defined_7 :  7; /* 35-41 */
+        __u32   pr              :  1; /* 42 tod programmable register validity */
+        __u32   fc              :  1; /* 43 fp control register validity */
+        __u32   ap              :  1; /* 44 ancillary report */
+        __u32   to_be_defined_8 :  1; /* 45 */
+        __u32   ct              :  1; /* 46 cpu timer validity */
+        __u32   cc              :  1; /* 47 clock comparator validity */
+        __u32   to_be_defined_9 : 16; /* 47-63 */
 };
 
 /*