diff options
Diffstat (limited to 'block/blk-settings.c')
-rw-r--r-- | block/blk-settings.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/block/blk-settings.c b/block/blk-settings.c index c8d0c5724098..9a8ffdd0ce3d 100644 --- a/block/blk-settings.c +++ b/block/blk-settings.c | |||
@@ -296,6 +296,7 @@ EXPORT_SYMBOL(blk_queue_stack_limits); | |||
296 | * blk_queue_dma_drain - Set up a drain buffer for excess dma. | 296 | * blk_queue_dma_drain - Set up a drain buffer for excess dma. |
297 | * | 297 | * |
298 | * @q: the request queue for the device | 298 | * @q: the request queue for the device |
299 | * @dma_drain_needed: fn which returns non-zero if drain is necessary | ||
299 | * @buf: physically contiguous buffer | 300 | * @buf: physically contiguous buffer |
300 | * @size: size of the buffer in bytes | 301 | * @size: size of the buffer in bytes |
301 | * | 302 | * |
@@ -315,14 +316,16 @@ EXPORT_SYMBOL(blk_queue_stack_limits); | |||
315 | * device can support otherwise there won't be room for the drain | 316 | * device can support otherwise there won't be room for the drain |
316 | * buffer. | 317 | * buffer. |
317 | */ | 318 | */ |
318 | int blk_queue_dma_drain(struct request_queue *q, void *buf, | 319 | extern int blk_queue_dma_drain(struct request_queue *q, |
319 | unsigned int size) | 320 | dma_drain_needed_fn *dma_drain_needed, |
321 | void *buf, unsigned int size) | ||
320 | { | 322 | { |
321 | if (q->max_hw_segments < 2 || q->max_phys_segments < 2) | 323 | if (q->max_hw_segments < 2 || q->max_phys_segments < 2) |
322 | return -EINVAL; | 324 | return -EINVAL; |
323 | /* make room for appending the drain */ | 325 | /* make room for appending the drain */ |
324 | --q->max_hw_segments; | 326 | --q->max_hw_segments; |
325 | --q->max_phys_segments; | 327 | --q->max_phys_segments; |
328 | q->dma_drain_needed = dma_drain_needed; | ||
326 | q->dma_drain_buffer = buf; | 329 | q->dma_drain_buffer = buf; |
327 | q->dma_drain_size = size; | 330 | q->dma_drain_size = size; |
328 | 331 | ||
@@ -386,7 +389,7 @@ void blk_queue_update_dma_alignment(struct request_queue *q, int mask) | |||
386 | } | 389 | } |
387 | EXPORT_SYMBOL(blk_queue_update_dma_alignment); | 390 | EXPORT_SYMBOL(blk_queue_update_dma_alignment); |
388 | 391 | ||
389 | int __init blk_settings_init(void) | 392 | static int __init blk_settings_init(void) |
390 | { | 393 | { |
391 | blk_max_low_pfn = max_low_pfn - 1; | 394 | blk_max_low_pfn = max_low_pfn - 1; |
392 | blk_max_pfn = max_pfn - 1; | 395 | blk_max_pfn = max_pfn - 1; |