Merge branch 'from-linus' into upstream

[linux-2.6-omap-h63xx.git] / drivers / s390 / block / dasd_ioctl.c

diff --git a/drivers/s390/block/dasd_ioctl.c b/drivers/s390/block/dasd_ioctl.c
index b8c80d28df41dba762d8827608fd22e5c5c93e2f..8fed3603e9eac2afe7163b76011e3e18b0084855 100644 (file)
--- a/drivers/s390/block/dasd_ioctl.c
+++ b/drivers/s390/block/dasd_ioctl.c
@@ -9,7 +9,6 @@
  *
  * i/o controls for the dasd driver.
  */
-#include <linux/config.h>
 #include <linux/interrupt.h>
 #include <linux/major.h>
 #include <linux/fs.h>
@@ -90,10 +89,10 @@ static int
 dasd_ioctl_quiesce(struct dasd_device *device)
 {
        unsigned long flags;
-       
+
        if (!capable (CAP_SYS_ADMIN))
                return -EACCES;
-       
+
        DEV_MESSAGE (KERN_DEBUG, device, "%s",
                     "Quiesce IO on device");
        spin_lock_irqsave(get_ccwdev_lock(device->cdev), flags);
@@ -110,13 +109,13 @@ static int
 dasd_ioctl_resume(struct dasd_device *device)
 {
        unsigned long flags;
-       
-       if (!capable (CAP_SYS_ADMIN)) 
+
+       if (!capable (CAP_SYS_ADMIN))
                return -EACCES;
 
        DEV_MESSAGE (KERN_DEBUG, device, "%s",
                     "resume IO on device");
-       
+
        spin_lock_irqsave(get_ccwdev_lock(device->cdev), flags);
        device->stopped &= ~DASD_STOPPED_QUIESCE;
        spin_unlock_irqrestore(get_ccwdev_lock(device->cdev), flags);
@@ -287,7 +286,7 @@ dasd_ioctl_information(struct dasd_device *device,
        dasd_info->open_count = atomic_read(&device->open_count);
        if (!device->bdev)
                dasd_info->open_count++;
-       
+
        /*
         * check if device is really formatted
         * LDL / CDL was returned by 'fill_info'
@@ -346,7 +345,7 @@ dasd_ioctl_set_ro(struct block_device *bdev, void __user *argp)
        if (bdev != bdev->bd_contains)
                // ro setting is not allowed for partitions
                return -EINVAL;
-       if (get_user(intval, (int *)argp))
+       if (get_user(intval, (int __user *)argp))
                return -EFAULT;
 
        set_disk_ro(bdev->bd_disk, intval);