diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-19 17:43:04 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-19 17:43:04 -0700 |
commit | 31583d6acf940d2951bc8716557b06d9de5a0c4b (patch) | |
tree | 607aef385b0998f0cb7ff63b05407afed5182840 /block/blk-settings.c | |
parent | ee37ba7a4212c7420f12e6a2ad8a3966649ede7a (diff) | |
parent | f740f5ca056f0a4eff3abdf272a8a4ba3965d57d (diff) |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
Fix kernel-doc parameter name typo in blk-settings.c:
block: rename CONFIG_LBD to CONFIG_LBDAF
block: Fix bounce_pfn setting
hd: stop defining MAJOR_NR
Diffstat (limited to 'block/blk-settings.c')
-rw-r--r-- | block/blk-settings.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/block/blk-settings.c b/block/blk-settings.c index 7541ea4bf9f..bd582a7f531 100644 --- a/block/blk-settings.c +++ b/block/blk-settings.c @@ -97,7 +97,7 @@ EXPORT_SYMBOL_GPL(blk_queue_lld_busy); /** * blk_set_default_limits - reset limits to default values - * @limits: the queue_limits structure to reset + * @lim: the queue_limits structure to reset * * Description: * Returns a queue_limit struct to its default state. Can be used by @@ -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; |