summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorRichard Yao <[email protected]>2015-08-31 16:11:45 -0700
committerBrian Behlendorf <[email protected]>2015-09-01 09:33:18 -0700
commit97771edaca2cac5905571f1355dd2b6256a306b4 (patch)
treebe1c22912594f8d61203f0c1f12117139e49f6c4 /config
parent3c119330a6b4e166f85c3b07ae011231f9253dee (diff)
Remove blk_queue_io_opt() autotools check
This is needed for supporting kernels earlier than 2.6.30. Support for those kernels was dropped, so we can safely remove this check. Signed-off-by: Richard Yao <[email protected]> Signed-off-by: Brian Behlendorf <[email protected]>
Diffstat (limited to 'config')
-rw-r--r--config/kernel-blk-queue-io-opt.m424
-rw-r--r--config/kernel.m41
2 files changed, 0 insertions, 25 deletions
diff --git a/config/kernel-blk-queue-io-opt.m4 b/config/kernel-blk-queue-io-opt.m4
deleted file mode 100644
index fb9b6841b..000000000
--- a/config/kernel-blk-queue-io-opt.m4
+++ /dev/null
@@ -1,24 +0,0 @@
-dnl #
-dnl # 2.6.30 API change
-dnl # The blk_queue_io_opt() function was added to indicate the optimal
-dnl # I/O size for the device.
-dnl #
-AC_DEFUN([ZFS_AC_KERNEL_BLK_QUEUE_IO_OPT], [
- AC_MSG_CHECKING([whether blk_queue_io_opt() is available])
- tmp_flags="$EXTRA_KCFLAGS"
- EXTRA_KCFLAGS="${NO_UNUSED_BUT_SET_VARIABLE}"
- ZFS_LINUX_TRY_COMPILE([
- #include <linux/blkdev.h>
- ],[
- struct request_queue *q = NULL;
- unsigned int opt = 1;
- (void) blk_queue_io_opt(q, opt);
- ],[
- AC_MSG_RESULT(yes)
- AC_DEFINE(HAVE_BLK_QUEUE_IO_OPT, 1,
- [blk_queue_io_opt() is available])
- ],[
- AC_MSG_RESULT(no)
- ])
- EXTRA_KCFLAGS="$tmp_flags"
-])
diff --git a/config/kernel.m4 b/config/kernel.m4
index d24e0b6df..09d8003f1 100644
--- a/config/kernel.m4
+++ b/config/kernel.m4
@@ -29,7 +29,6 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [
ZFS_AC_KERNEL_BLK_QUEUE_FLUSH
ZFS_AC_KERNEL_BLK_QUEUE_MAX_HW_SECTORS
ZFS_AC_KERNEL_BLK_QUEUE_MAX_SEGMENTS
- ZFS_AC_KERNEL_BLK_QUEUE_IO_OPT
ZFS_AC_KERNEL_BLK_QUEUE_NONROT
ZFS_AC_KERNEL_BLK_QUEUE_DISCARD
ZFS_AC_KERNEL_BLK_FETCH_REQUEST