diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-19 03:41:27 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-19 03:41:27 +0400 |
| commit | 93c3d65b28bab6da520c2add9cb387a0303f8b2d (patch) | |
| tree | d53d83ffe07d4237e1f8b1b6f02fa0362d8dacd2 /include/acpi/actbl.h | |
| parent | 9ef9b20bd0eef609f07960a997c13cab8fe15d2e (diff) | |
| download | linux-93c3d65b28bab6da520c2add9cb387a0303f8b2d.tar.xz | |
nvme: fix merge error due to change of 'make_request_fn' fn type
The type of 'make_request_fn' changed in 5a7bbad27a4 ("block: remove
support for bio remapping from ->make_request"), but the merge of the
nvme driver didn't take that into account, and as a result the driver
would compile with a warning:
drivers/block/nvme.c: In function 'nvme_alloc_ns':
drivers/block/nvme.c:1336:2: warning: passing argument 2 of 'blk_queue_make_request' from incompatible pointer type [enabled by default]
include/linux/blkdev.h:830:13: note: expected 'void (*)(struct request_queue *, struct bio *)' but argument is of type 'int (*)(struct request_queue *, struct bio *)'
It's benign, but the warning is annoying.
Reported-by: Stephen Rothwell <sfr@canb.auug.org>
Cc: Matthew Wilcox <matthew.r.wilcox@intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/acpi/actbl.h')
0 files changed, 0 insertions, 0 deletions