X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=config%2Fkernel.m4;h=d10c6e62892c5d338ddbf3b3fb55dd926201ccc8;hb=86dd0fd9222b6103c6533036c47b908ece944460;hp=c08b6a22c4e2184763e7407f083062fbdc1b70cd;hpb=26e08952e6ad113b91ae7d31263b6a4fd3a5a09f;p=zfs.git

diff --git a/config/kernel.m4 b/config/kernel.m4
index c08b6a2..d10c6e6 100644
--- a/config/kernel.m4
+++ b/config/kernel.m4
@@ -302,6 +302,13 @@ AC_DEFUN([ZFS_AC_SPL], [
 			sourcelink=../spl
 		])
 
+		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}`
 		], [
@@ -386,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