Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6

* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
  [S390] tod clock: announce clocksource as perfect
  [S390] Rename "idle_time" attribute to "idle_time_us".
  [S390] Fix priority mistakes in drivers/s390/cio/cmf.c
  [S390] Fix memory detection.
  [S390] Fix compile on !CONFIG_SMP.
  [S390] device_schedule_callback() for dcssblk.
  [S390] Fix smsgiucv init on no iucv machines
  [S390] cio: use INIT_WORK to initialize struct work.

4 files changed, 14 insertions, 5 deletions

diff --git a/drivers/s390/block/dcssblk.c b/drivers/s390/block/dcssblk.c
index 859f870552e3..5e083d1f57e7 100644
--- a/drivers/s390/block/dcssblk.c
+++ b/drivers/s390/block/dcssblk.c
@@ -193,6 +193,12 @@ dcssblk_segment_warn(int rc, char* seg_name)
         }
 }
 
+static void dcssblk_unregister_callback(struct device *dev)
+{
+        device_unregister(dev);
+        put_device(dev);
+}
+
 /*
  * device attribute for switching shared/nonshared (exclusive)
  * operation (show + store)
@@ -276,8 +282,7 @@ removeseg:
         blk_cleanup_queue(dev_info->dcssblk_queue);
         dev_info->gd->queue = NULL;
         put_disk(dev_info->gd);
-        device_unregister(dev);
-        put_device(dev);
+        rc = device_schedule_callback(dev, dcssblk_unregister_callback);
 out:
         up_write(&dcssblk_devices_sem);
         return rc;
diff --git a/drivers/s390/cio/cmf.c b/drivers/s390/cio/cmf.c
index 725b0dd14269..f4c132ab39ed 100644
--- a/drivers/s390/cio/cmf.c
+++ b/drivers/s390/cio/cmf.c
@@ -343,10 +343,10 @@ static int cmf_copy_block(struct ccw_device *cdev)
 
         if (sch->schib.scsw.fctl & SCSW_FCTL_START_FUNC) {
                 /* Don't copy if a start function is in progress. */
-                if ((!sch->schib.scsw.actl & SCSW_ACTL_SUSPENDED) &&
+                if ((!(sch->schib.scsw.actl & SCSW_ACTL_SUSPENDED)) &&
                     (sch->schib.scsw.actl &
                      (SCSW_ACTL_DEVACT | SCSW_ACTL_SCHACT)) &&
-                    (!sch->schib.scsw.stctl & SCSW_STCTL_SEC_STATUS))
+                    (!(sch->schib.scsw.stctl & SCSW_STCTL_SEC_STATUS)))
                         return -EBUSY;
         }
         cmb_data = cdev->private->cmb;
diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
index 7ee57f084a89..74f6b539974a 100644
--- a/drivers/s390/cio/device.c
+++ b/drivers/s390/cio/device.c
@@ -738,7 +738,7 @@ static int io_subchannel_initialize_dev(struct subchannel *sch,
         atomic_set(&cdev->private->onoff, 0);
         cdev->dev.parent = &sch->dev;
         cdev->dev.release = ccw_device_release;
-        INIT_LIST_HEAD(&cdev->private->kick_work.entry);
+        INIT_WORK(&cdev->private->kick_work, NULL);
         cdev->dev.groups = ccwdev_attr_groups;
         /* Do first half of device_register. */
         device_initialize(&cdev->dev);
diff --git a/drivers/s390/net/smsgiucv.c b/drivers/s390/net/smsgiucv.c
index 3ccca5871fdf..47bb47b48581 100644
--- a/drivers/s390/net/smsgiucv.c
+++ b/drivers/s390/net/smsgiucv.c
@@ -148,6 +148,10 @@ static int __init smsg_init(void)
 {
         int rc;
 
+        if (!MACHINE_IS_VM) {
+                rc = -EPROTONOSUPPORT;
+                goto out;
+        }
         rc = driver_register(&smsg_driver);
         if (rc != 0)
                 goto out;