X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=config%2Fkernel.m4;h=d10c6e62892c5d338ddbf3b3fb55dd926201ccc8;hb=86dd0fd9222b6103c6533036c47b908ece944460;hp=7d8a5f4d5339abc32ea3e6b360131ec87185e60f;hpb=5085d55817f67e2333366e517c6cc7a6fdda50f7;p=zfs.git

diff --git a/config/kernel.m4 b/config/kernel.m4
index 7d8a5f4..d10c6e6 100644
--- a/config/kernel.m4
+++ b/config/kernel.m4
@@ -281,14 +281,35 @@ AC_DEFUN([ZFS_AC_SPL], [
 
 	AC_MSG_CHECKING([spl source directory])
 	AS_IF([test -z "$splsrc"], [
+		dnl #
+		dnl # Look in the standard development package location
+		dnl #
 		sourcelink=`ls -1d /usr/src/spl-*/${LINUX_VERSION} \
 		            2>/dev/null | tail -1`
 
-		AS_IF([test -z "$sourcelink" || test ! -e $sourcelink], [
+		dnl #
+		dnl # Look in the DKMS source location
+		dnl #
+		AS_IF([test -z "$sourcelink" || test ! -e $sourcelink/spl_config.h], [
+			sourcelink=`ls -1d /var/lib/dkms/spl/*/build \
+			            2>/dev/null | tail -1`
+		])
+
+		dnl #
+		dnl # Look in the parent directory
+		dnl #
+		AS_IF([test -z "$sourcelink" || test ! -e $sourcelink/spl_config.h], [
 			sourcelink=../spl
 		])
 
-		AS_IF([test -e $sourcelink], [
+		dnl #
+		dnl # Look in the kernel directory
+		dnl #
+		AS_IF([test -z "$sourcelink" || test ! -e $sourcelink/spl_config.h], [
+			sourcelink="$LINUX"
+		])
+
+		AS_IF([test -e $sourcelink/spl_config.h], [
 			splsrc=`readlink -f ${sourcelink}`
 		], [
 			AC_MSG_RESULT([Not found])
@@ -372,29 +393,10 @@ AC_DEFUN([ZFS_AC_KERNEL_CONFIG], [
 			[Define to 1 if licensed under the GPL])
 	])
 
-	ZFS_AC_KERNEL_CONFIG_PREEMPT
 	ZFS_AC_KERNEL_CONFIG_DEBUG_LOCK_ALLOC
 ])
 
 dnl #
-dnl # Check CONFIG_PREEMPT
-dnl #
-dnl # Premptible kernels will be supported in the future.  But at the
-dnl # moment there are a few places in the code which need to be updated
-dnl # to accomidate them.  Until that work occurs we should detect this
-dnl # at configure time and fail with a sensible message.  Otherwise,
-dnl # people will be able to build successfully, however they will have
-dnl # stability problems.  See https://github.com/zfsonlinux/zfs/issues/83
-dnl #
-AC_DEFUN([ZFS_AC_KERNEL_CONFIG_PREEMPT], [
-
-	ZFS_LINUX_CONFIG([PREEMPT],
-		AC_MSG_ERROR([
-	*** Kernel built with CONFIG_PREEMPT which is not supported.
-	*** You must rebuild your kernel without this option.]), [])
-])
-
-dnl #
 dnl # Check CONFIG_DEBUG_LOCK_ALLOC
 dnl #
 dnl # This is typically only set for debug kernels because it comes with