aboutsummaryrefslogtreecommitdiff
path: root/block/blk-settings.c
diff options
context:
space:
mode:
authorMartin K. Petersen <martin.petersen@oracle.com>2009-06-18 09:56:03 +0200
committerJens Axboe <jens.axboe@oracle.com>2009-06-18 09:56:20 +0200
commit3a02c8e8142f7f133d4c6e72bc3e1d830e6b8b9e (patch)
tree7485ad50ba3b773d186119d48cba2a124e667125 /block/blk-settings.c
parentddeb9c3e949751992628628d000915a317df52c4 (diff)
downloadlinux-2.6.34-ux500-3a02c8e8142f7f133d4c6e72bc3e1d830e6b8b9e.tar.gz
block: Fix bounce_pfn setting
Correct stacking bounce_pfn limit setting and prevent warnings on 32-bit. Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'block/blk-settings.c')
-rw-r--r--block/blk-settings.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-settings.c b/block/blk-settings.c
index 7541ea4bf9f..81bc0d1fdb5 100644
--- a/block/blk-settings.c
+++ b/block/blk-settings.c
@@ -112,7 +112,7 @@ void blk_set_default_limits(struct queue_limits *lim)
lim->max_segment_size = MAX_SEGMENT_SIZE;
lim->max_sectors = lim->max_hw_sectors = SAFE_MAX_SECTORS;
lim->logical_block_size = lim->physical_block_size = lim->io_min = 512;
- lim->bounce_pfn = BLK_BOUNCE_ANY;
+ lim->bounce_pfn = (unsigned long)(BLK_BOUNCE_ANY >> PAGE_SHIFT);
lim->alignment_offset = 0;
lim->io_opt = 0;
lim->misaligned = 0;