diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-11 14:37:45 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-11 14:37:45 -0500 |
| commit | c827ba4cb49a30ce581201fd0ba2be77cde412c7 (patch) | |
| tree | b573020e4d30ecdf69b22fcd1ced3dbb0e024ed3 /block | |
| parent | fdba0f2da4b1db682b829b76302b2f25c376051c (diff) | |
| parent | 784020fb950741cbb7390c6b622321da626fb1e8 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: Update defconfig.
[SPARC64]: Add PCI MSI support on Niagara.
[SPARC64] IRQ: Use irq_desc->chip_data instead of irq_desc->handler_data
[SPARC64]: Add obppath sysfs attribute for SBUS and PCI devices.
[PARTITION]: Add whole_disk attribute.
Diffstat (limited to 'block')
| -rw-r--r-- | block/ioctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/ioctl.c b/block/ioctl.c index f6962b64660e..e3f5eb9882cf 100644 --- a/block/ioctl.c +++ b/block/ioctl.c | |||
| @@ -61,7 +61,7 @@ static int blkpg_ioctl(struct block_device *bdev, struct blkpg_ioctl_arg __user | |||
| 61 | } | 61 | } |
| 62 | } | 62 | } |
| 63 | /* all seems OK */ | 63 | /* all seems OK */ |
| 64 | add_partition(disk, part, start, length); | 64 | add_partition(disk, part, start, length, ADDPART_FLAG_NONE); |
| 65 | mutex_unlock(&bdev->bd_mutex); | 65 | mutex_unlock(&bdev->bd_mutex); |
| 66 | return 0; | 66 | return 0; |
| 67 | case BLKPG_DEL_PARTITION: | 67 | case BLKPG_DEL_PARTITION: |