patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / drivers / block / umem.c

diff --git a/drivers/block/umem.c b/drivers/block/umem.c
index 5a1e349..2b126d8 100644 (file)
--- a/drivers/block/umem.c
+++ b/drivers/block/umem.c
@@ -278,7 +278,7 @@ static void dump_dmastat(struct cardinfo *card, unsigned int dmastat)
  * Whenever IO on the active page completes, the Ready page is activated
  * and the ex-Active page is clean out and made Ready.
  * Otherwise the Ready page is only activated when it becomes full, or
- * when mm_unplug_device is called via blk_run_queues().
+ * when mm_unplug_device is called via the unplug_io_fn.
  *
  * If a request arrives while both pages a full, it is queued, and b_rdev is
  * overloaded to record whether it was a read or a write.
@@ -833,7 +833,7 @@ static int mm_ioctl(struct inode *i, struct file *f, unsigned int cmd, unsigned
                geo.start     = get_start_sect(i->i_bdev);
                geo.cylinders = size / (geo.heads * geo.sectors);
 
-               if (copy_to_user((void *) arg, &geo, sizeof(geo)))
+               if (copy_to_user((void __user *) arg, &geo, sizeof(geo)))
                        return -EFAULT;
                return 0;
        }