/[linux-patches]/genpatches-2.6/trunk/2.6.12-pre/1009_linux-2.6.11.10.patch
Gentoo

Contents of /genpatches-2.6/trunk/2.6.12-pre/1009_linux-2.6.11.10.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 4 - (show annotations) (download) (as text)
Sat Jun 11 23:20:41 2005 UTC (15 years, 5 months ago) by dsd
File MIME type: text/x-diff
File size: 1897 byte(s)
Create 2.6.12 branch
1 diff -Naur linux-2.6.11.9/Makefile linux-2.6.11.10/Makefile
2 --- linux-2.6.11.9/Makefile 2005-05-11 15:42:25.000000000 -0700
3 +++ linux-2.6.11.10/Makefile 2005-05-16 10:50:30.000000000 -0700
4 @@ -1,7 +1,7 @@
5 VERSION = 2
6 PATCHLEVEL = 6
7 SUBLEVEL = 11
8 -EXTRAVERSION = .9
9 +EXTRAVERSION = .10
10 NAME=Woozy Beaver
11
12 # *DOCUMENTATION*
13 diff -Naur linux-2.6.11.9/drivers/block/ioctl.c linux-2.6.11.10/drivers/block/ioctl.c
14 --- linux-2.6.11.9/drivers/block/ioctl.c 2005-05-11 15:41:10.000000000 -0700
15 +++ linux-2.6.11.10/drivers/block/ioctl.c 2005-05-16 10:50:31.000000000 -0700
16 @@ -237,3 +237,5 @@
17 }
18 return ret;
19 }
20 +
21 +EXPORT_SYMBOL_GPL(blkdev_ioctl);
22 diff -Naur linux-2.6.11.9/drivers/block/pktcdvd.c linux-2.6.11.10/drivers/block/pktcdvd.c
23 --- linux-2.6.11.9/drivers/block/pktcdvd.c 2005-05-11 15:41:09.000000000 -0700
24 +++ linux-2.6.11.10/drivers/block/pktcdvd.c 2005-05-16 10:50:31.000000000 -0700
25 @@ -2400,7 +2400,7 @@
26 case CDROM_LAST_WRITTEN:
27 case CDROM_SEND_PACKET:
28 case SCSI_IOCTL_SEND_COMMAND:
29 - return ioctl_by_bdev(pd->bdev, cmd, arg);
30 + return blkdev_ioctl(pd->bdev->bd_inode, file, cmd, arg);
31
32 case CDROMEJECT:
33 /*
34 @@ -2408,7 +2408,7 @@
35 * have to unlock it or else the eject command fails.
36 */
37 pkt_lock_door(pd, 0);
38 - return ioctl_by_bdev(pd->bdev, cmd, arg);
39 + return blkdev_ioctl(pd->bdev->bd_inode, file, cmd, arg);
40
41 default:
42 printk("pktcdvd: Unknown ioctl for %s (%x)\n", pd->name, cmd);
43 diff -Naur linux-2.6.11.9/drivers/char/raw.c linux-2.6.11.10/drivers/char/raw.c
44 --- linux-2.6.11.9/drivers/char/raw.c 2005-05-11 15:42:19.000000000 -0700
45 +++ linux-2.6.11.10/drivers/char/raw.c 2005-05-16 10:50:31.000000000 -0700
46 @@ -122,7 +122,7 @@
47 {
48 struct block_device *bdev = filp->private_data;
49
50 - return ioctl_by_bdev(bdev, command, arg);
51 + return blkdev_ioctl(bdev->bd_inode, filp, command, arg);
52 }
53
54 static void bind_device(struct raw_config_request *rq)

  ViewVC Help
Powered by ViewVC 1.1.20