summaryrefslogtreecommitdiffstats
path: root/config/kernel-blk-end-request.m4
diff options
context:
space:
mode:
Diffstat (limited to 'config/kernel-blk-end-request.m4')
-rw-r--r--config/kernel-blk-end-request.m423
1 files changed, 21 insertions, 2 deletions
diff --git a/config/kernel-blk-end-request.m4 b/config/kernel-blk-end-request.m4
index 6719516c1..20ad1a926 100644
--- a/config/kernel-blk-end-request.m4
+++ b/config/kernel-blk-end-request.m4
@@ -1,6 +1,8 @@
dnl #
-dnl # 2.6.18 API change
-nl #
+dnl # 2.6.31 API change
+dnl # In 2.6.29 kernels blk_end_request() was a GPL-only symbol, this was
+dnl # changed in 2.6.31 so it may be used by non-GPL modules.
+dnl #
AC_DEFUN([ZFS_AC_KERNEL_BLK_END_REQUEST], [
AC_MSG_CHECKING([whether blk_end_request() is available])
ZFS_LINUX_TRY_COMPILE([
@@ -15,4 +17,21 @@ AC_DEFUN([ZFS_AC_KERNEL_BLK_END_REQUEST], [
],[
AC_MSG_RESULT(no)
])
+
+ AC_MSG_CHECKING([whether blk_end_request() is GPL-only])
+ ZFS_LINUX_TRY_COMPILE([
+ #include <linux/module.h>
+ #include <linux/blkdev.h>
+
+ MODULE_LICENSE("CDDL");
+ ],[
+ struct request *req = NULL;
+ (void) blk_end_request(req, 0, 0);
+ ],[
+ AC_MSG_RESULT(no)
+ ],[
+ AC_MSG_RESULT(yes)
+ AC_DEFINE(HAVE_BLK_END_REQUEST_GPL_ONLY, 1,
+ [blk_end_request() is GPL-only])
+ ])
])