diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2010-02-28 19:41:12 +0100 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2010-02-28 19:41:12 +0100 |
| commit | 6fc2de06ef1e691d032aa572478c905b7495a274 (patch) | |
| tree | 778df1440b045d67c997d7bd79ee3c6c11f57638 /drivers/block/ps3disk.c | |
| parent | 58c24a61614f5da290068e47fc5ec65370eb61dd (diff) | |
| parent | 8a78362c4eefc1deddbefe2c7f38aabbc2429d6b (diff) | |
| download | linux-6fc2de06ef1e691d032aa572478c905b7495a274.tar.bz2 | |
Merge branch 'for-2.6.34-next' into for-2.6.34
Diffstat (limited to 'drivers/block/ps3disk.c')
| -rw-r--r-- | drivers/block/ps3disk.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/block/ps3disk.c b/drivers/block/ps3disk.c index 03a130dca8ab..bc95469d33c1 100644 --- a/drivers/block/ps3disk.c +++ b/drivers/block/ps3disk.c @@ -474,7 +474,7 @@ static int __devinit ps3disk_probe(struct ps3_system_bus_device *_dev) blk_queue_bounce_limit(queue, BLK_BOUNCE_HIGH); - blk_queue_max_sectors(queue, dev->bounce_size >> 9); + blk_queue_max_hw_sectors(queue, dev->bounce_size >> 9); blk_queue_segment_boundary(queue, -1UL); blk_queue_dma_alignment(queue, dev->blk_size-1); blk_queue_logical_block_size(queue, dev->blk_size); @@ -482,8 +482,7 @@ static int __devinit ps3disk_probe(struct ps3_system_bus_device *_dev) blk_queue_ordered(queue, QUEUE_ORDERED_DRAIN_FLUSH, ps3disk_prepare_flush); - blk_queue_max_phys_segments(queue, -1); - blk_queue_max_hw_segments(queue, -1); + blk_queue_max_segments(queue, -1); blk_queue_max_segment_size(queue, dev->bounce_size); gendisk = alloc_disk(PS3DISK_MINORS); |