diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-27 09:05:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-27 09:05:49 -0700 |
| commit | e0ab0bb6d2b77917f4c31f157b2690602a5608f9 (patch) | |
| tree | 644c65b44f551e29341d5efab6b309ff1e6782f2 /block/ll_rw_blk.c | |
| parent | 5c46010af210712c8a390c7fe50ff05448983061 (diff) | |
| parent | 40bee44eaef91b6030037c8bb47f909181fb1edc (diff) | |
| download | kernel_samsung_smdk4412-e0ab0bb6d2b77917f4c31f157b2690602a5608f9.zip kernel_samsung_smdk4412-e0ab0bb6d2b77917f4c31f157b2690602a5608f9.tar.gz kernel_samsung_smdk4412-e0ab0bb6d2b77917f4c31f157b2690602a5608f9.tar.bz2 | |
Merge branch 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block:
Export __splice_from_pipe()
2/2 splice: dont readpage
1/2 splice: dont steal
make elv_register() output atomic
block: blk_max_pfn is somtimes wrong
Diffstat (limited to 'block/ll_rw_blk.c')
| -rw-r--r-- | block/ll_rw_blk.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/block/ll_rw_blk.c b/block/ll_rw_blk.c index 38c293b..3de0695 100644 --- a/block/ll_rw_blk.c +++ b/block/ll_rw_blk.c @@ -1221,7 +1221,7 @@ void blk_recount_segments(request_queue_t *q, struct bio *bio) * considered part of another segment, since that might * change with the bounce page. */ - high = page_to_pfn(bv->bv_page) >= q->bounce_pfn; + high = page_to_pfn(bv->bv_page) > q->bounce_pfn; if (high || highprv) goto new_hw_segment; if (cluster) { @@ -3658,8 +3658,8 @@ int __init blk_dev_init(void) open_softirq(BLOCK_SOFTIRQ, blk_done_softirq, NULL); register_hotcpu_notifier(&blk_cpu_notifier); - blk_max_low_pfn = max_low_pfn; - blk_max_pfn = max_pfn; + blk_max_low_pfn = max_low_pfn - 1; + blk_max_pfn = max_pfn - 1; return 0; } |