Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 9df1bb9b516daeece159ab7fb262d01a0359247c

Authored by Jens Axboe
1 parent 3969251b80
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

Revert "block: Fix bounce limit setting in DM" 

This reverts commit a05c0205ba031c01bba33a21bf0a35920eb64833.

DM doesn't need to access the bounce_pfn directly.

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

Showing 3 changed files with 1 additions and 19 deletions Side-by-side Diff

block/blk-settings.c
Diff comments   View file @ 9df1bb9
... ... @@ -194,23 +194,6 @@
194 194 EXPORT_SYMBOL(blk_queue_bounce_limit);
195 195  
196 196 /**
197   - * blk_queue_bounce_pfn - set the bounce buffer limit for queue
198   - * @q: the request queue for the device
199   - * @pfn: max address
200   - *
201   - * Description:
202   - * This function is similar to blk_queue_bounce_limit except it
203   - * neither changes allocation flags, nor does it set up the ISA DMA
204   - * pool. This function should only be used by stacking drivers.
205   - * Hardware drivers should use blk_queue_bounce_limit instead.
206   - */
207   -void blk_queue_bounce_pfn(struct request_queue *q, u64 pfn)
208   -{
209   - q->limits.bounce_pfn = pfn;
210   -}
211   -EXPORT_SYMBOL(blk_queue_bounce_pfn);
212   -
213   -/**
214 197 * blk_queue_max_sectors - set max sectors for a request for this queue
215 198 * @q: the request queue for the device
216 199 * @max_sectors: max sectors in the usual 512b unit
drivers/md/dm-table.c
Diff comments   View file @ 9df1bb9
... ... @@ -920,7 +920,7 @@
920 920 blk_queue_max_segment_size(q, t->limits.max_segment_size);
921 921 blk_queue_max_hw_sectors(q, t->limits.max_hw_sectors);
922 922 blk_queue_segment_boundary(q, t->limits.seg_boundary_mask);
923   - blk_queue_bounce_pfn(q, t->limits.bounce_pfn);
  923 + blk_queue_bounce_limit(q, t->limits.bounce_pfn);
924 924  
925 925 if (t->limits.no_cluster)
926 926 queue_flag_clear_unlocked(QUEUE_FLAG_CLUSTER, q);
include/linux/blkdev.h
Diff comments   View file @ 9df1bb9
... ... @@ -910,7 +910,6 @@
910 910 extern void blk_cleanup_queue(struct request_queue *);
911 911 extern void blk_queue_make_request(struct request_queue *, make_request_fn *);
912 912 extern void blk_queue_bounce_limit(struct request_queue *, u64);
913   -extern void blk_queue_bounce_pfn(struct request_queue *, u64);
914 913 extern void blk_queue_max_sectors(struct request_queue *, unsigned int);
915 914 extern void blk_queue_max_hw_sectors(struct request_queue *, unsigned int);
916 915 extern void blk_queue_max_phys_segments(struct request_queue *, unsigned short);