X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=config%2Fkernel.m4;h=c411c8f492831a153f7b68a002cc573cdcea4cb0;hb=7268e1bec8478639b7a1047e02ab931f30bc2f92;hp=193aae11391ef8c5c73652ddfe5ff2a4000b3fac;hpb=6283f55ea1b91e680386388c17d14b89e344fa8d;p=zfs.git

diff --git a/config/kernel.m4 b/config/kernel.m4
index 193aae1..c411c8f 100644
--- a/config/kernel.m4
+++ b/config/kernel.m4
@@ -12,8 +12,13 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [
 	ZFS_AC_KERNEL_INVALIDATE_BDEV_ARGS
 	ZFS_AC_KERNEL_BDEV_LOGICAL_BLOCK_SIZE
 	ZFS_AC_KERNEL_BIO_EMPTY_BARRIER
+	ZFS_AC_KERNEL_BIO_FAILFAST
+	ZFS_AC_KERNEL_BIO_FAILFAST_DTD
+	ZFS_AC_KERNEL_REQ_FAILFAST_MASK
 	ZFS_AC_KERNEL_BIO_END_IO_T_ARGS
+	ZFS_AC_KERNEL_BIO_RW_SYNC
 	ZFS_AC_KERNEL_BIO_RW_SYNCIO
+	ZFS_AC_KERNEL_REQ_SYNC
 	ZFS_AC_KERNEL_BLK_END_REQUEST
 	ZFS_AC_KERNEL_BLK_FETCH_REQUEST
 	ZFS_AC_KERNEL_BLK_REQUEUE_REQUEST
@@ -23,6 +28,8 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [
 	ZFS_AC_KERNEL_GET_DISK_RO
 	ZFS_AC_KERNEL_RQ_IS_SYNC
 	ZFS_AC_KERNEL_RQ_FOR_EACH_SEGMENT
+	ZFS_AC_KERNEL_CONST_XATTR_HANDLER
+	ZFS_AC_KERNEL_FSYNC_2ARGS
 
 	if test "$LINUX_OBJ" != "$LINUX"; then
 		KERNELMAKE_PARAMS="$KERNELMAKE_PARAMS O=$LINUX_OBJ"
@@ -73,8 +80,11 @@ AC_DEFUN([ZFS_AC_KERNEL], [
 
 	AC_MSG_CHECKING([kernel source directory])
 	if test -z "$kernelsrc"; then
-		headersdir="/lib/modules/$(uname -r)/build"
-		if test -e "$headersdir"; then
+		if test -e "/lib/modules/$(uname -r)/source"; then
+			headersdir="/lib/modules/$(uname -r)/source"
+			sourcelink=$(readlink -f "$headersdir")
+		elif test -e "/lib/modules/$(uname -r)/build"; then
+			headersdir="/lib/modules/$(uname -r)/build"
 			sourcelink=$(readlink -f "$headersdir")
 		else
 			sourcelink=$(ls -1d /usr/src/kernels/* \
@@ -100,7 +110,9 @@ AC_DEFUN([ZFS_AC_KERNEL], [
 	AC_MSG_RESULT([$kernelsrc])
 	AC_MSG_CHECKING([kernel build directory])
 	if test -z "$kernelbuild"; then
-		if test -d ${kernelsrc}-obj/${target_cpu}/${target_cpu}; then
+		if test -e "/lib/modules/$(uname -r)/build"; then
+			kernelbuild=`readlink -f /lib/modules/$(uname -r)/build`
+		elif test -d ${kernelsrc}-obj/${target_cpu}/${target_cpu}; then
 			kernelbuild=${kernelsrc}-obj/${target_cpu}/${target_cpu}
 		elif test -d ${kernelsrc}-obj/${target_cpu}/default; then
 		        kernelbuild=${kernelsrc}-obj/${target_cpu}/default