mtd/drivers/mtd mtd_blkdevs.c,1.21,1.22

[David Woodhouse]

Update of /home/cvs/mtd/drivers/mtd
In directory phoenix.infradead.org:/tmp/cvs-serv24424

Modified Files:
	mtd_blkdevs.c 
Log Message:
Merge from 2.6: __user annotation and CLONE_KERNEL


Index: mtd_blkdevs.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/mtd_blkdevs.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- mtd_blkdevs.c	30 Mar 2004 20:59:46 -0000	1.21
+++ mtd_blkdevs.c	12 Jul 2004 12:35:28 -0000	1.22
@@ -216,12 +216,11 @@
 
 			memset(&g, 0, sizeof(g));
 			ret = tr->getgeo(dev, &g);
-
 			if (ret)
 				return ret;
 
 			g.start = get_start_sect(inode->i_bdev);
-			if (copy_to_user((void *)arg, &g, sizeof(g)))
+			if (copy_to_user((void __user *)arg, &g, sizeof(g)))
 				return -EFAULT;
 			return 0;
 		} /* else */
@@ -403,8 +402,7 @@
 
 	tr->blkcore_priv->rq->queuedata = tr;
 
-	ret = kernel_thread(mtd_blktrans_thread, tr, 
-			    CLONE_FS|CLONE_FILES|CLONE_SIGHAND);
+	ret = kernel_thread(mtd_blktrans_thread, tr, CLONE_KERNEL);
 	if (ret < 0) {
 		blk_cleanup_queue(tr->blkcore_priv->rq);
 		unregister_blkdev(tr->major, tr->name);