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] remove __io_virt and mmiowb.
  [S390] cio: use ARRAY_SIZE in device_id.c
  [S390] cio: Fixup interface for setting options on ccw devices.
  [S390] smp_call_function/smp_call_function_on locking.

3 files changed, 33 insertions, 4 deletions

diff --git a/drivers/s390/cio/device_id.c b/drivers/s390/cio/device_id.c
index f17275917fe5..997f46874537 100644
--- a/drivers/s390/cio/device_id.c
+++ b/drivers/s390/cio/device_id.c
@@ -11,6 +11,7 @@
 
 #include <linux/module.h>
 #include <linux/init.h>
+#include <linux/kernel.h>
 
 #include <asm/ccwdev.h>
 #include <asm/delay.h>
@@ -138,7 +139,7 @@ VM_virtual_device_info (__u16 devno, struct senseid *ps)
                 ps->cu_model = 0x60;
                 return;
         }
-        for (i = 0; i < sizeof(vm_devices) / sizeof(vm_devices[0]); i++)
+        for (i = 0; i < ARRAY_SIZE(vm_devices); i++)
                 if (diag_data.vrdcvcla == vm_devices[i].vrdcvcla &&
                     diag_data.vrdcvtyp == vm_devices[i].vrdcvtyp) {
                         ps->cu_type = vm_devices[i].cu_type;
diff --git a/drivers/s390/cio/device_ops.c b/drivers/s390/cio/device_ops.c
index d7b25b8f71d2..7c7775aae38a 100644
--- a/drivers/s390/cio/device_ops.c
+++ b/drivers/s390/cio/device_ops.c
@@ -23,8 +23,7 @@
 #include "chsc.h"
 #include "device.h"
 
-int
-ccw_device_set_options(struct ccw_device *cdev, unsigned long flags)
+int ccw_device_set_options_mask(struct ccw_device *cdev, unsigned long flags)
 {
        /*
         * The flag usage is mutal exclusive ...
@@ -39,6 +38,33 @@ ccw_device_set_options(struct ccw_device *cdev, unsigned long flags)
         return 0;
 }
 
+int ccw_device_set_options(struct ccw_device *cdev, unsigned long flags)
+{
+       /*
+        * The flag usage is mutal exclusive ...
+        */
+        if (((flags & CCWDEV_EARLY_NOTIFICATION) &&
+            (flags & CCWDEV_REPORT_ALL)) ||
+            ((flags & CCWDEV_EARLY_NOTIFICATION) &&
+             cdev->private->options.repall) ||
+            ((flags & CCWDEV_REPORT_ALL) &&
+             cdev->private->options.fast))
+                return -EINVAL;
+        cdev->private->options.fast |= (flags & CCWDEV_EARLY_NOTIFICATION) != 0;
+        cdev->private->options.repall |= (flags & CCWDEV_REPORT_ALL) != 0;
+        cdev->private->options.pgroup |= (flags & CCWDEV_DO_PATHGROUP) != 0;
+        cdev->private->options.force |= (flags & CCWDEV_ALLOW_FORCE) != 0;
+        return 0;
+}
+
+void ccw_device_clear_options(struct ccw_device *cdev, unsigned long flags)
+{
+        cdev->private->options.fast &= (flags & CCWDEV_EARLY_NOTIFICATION) == 0;
+        cdev->private->options.repall &= (flags & CCWDEV_REPORT_ALL) == 0;
+        cdev->private->options.pgroup &= (flags & CCWDEV_DO_PATHGROUP) == 0;
+        cdev->private->options.force &= (flags & CCWDEV_ALLOW_FORCE) == 0;
+}
+
 int
 ccw_device_clear(struct ccw_device *cdev, unsigned long intparm)
 {
@@ -601,7 +627,9 @@ _ccw_device_get_device_number(struct ccw_device *cdev)
 
 
 MODULE_LICENSE("GPL");
+EXPORT_SYMBOL(ccw_device_set_options_mask);
 EXPORT_SYMBOL(ccw_device_set_options);
+EXPORT_SYMBOL(ccw_device_clear_options);
 EXPORT_SYMBOL(ccw_device_clear);
 EXPORT_SYMBOL(ccw_device_halt);
 EXPORT_SYMBOL(ccw_device_resume);
diff --git a/drivers/s390/cio/qdio.c b/drivers/s390/cio/qdio.c
index d726cd5777de..5b1e3ff26c0b 100644
--- a/drivers/s390/cio/qdio.c
+++ b/drivers/s390/cio/qdio.c
@@ -3194,7 +3194,7 @@ qdio_establish(struct qdio_initialize *init_data)
 
         spin_lock_irqsave(get_ccwdev_lock(cdev),saveflags);
 
-        ccw_device_set_options(cdev, 0);
+        ccw_device_set_options_mask(cdev, 0);
         result=ccw_device_start_timeout(cdev,&irq_ptr->ccw,
                                         QDIO_DOING_ESTABLISH,0, 0,
                                         QDIO_ESTABLISH_TIMEOUT);