X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=config%2Fkernel.m4;h=87c49a82ce5a9c02b4e73cd4344e9d7c9e66d393;hb=9c4f40b894dd5b5c2ef18546d23d7e91095ac509;hp=015192b5b6b28b7a1d2226ed46d8c87ab80ec35d;hpb=df554c148ecfdfb7e597f8ab7eee71388b24a19d;p=zfs.git

diff --git a/config/kernel.m4 b/config/kernel.m4
index 015192b..87c49a8 100644
--- a/config/kernel.m4
+++ b/config/kernel.m4
@@ -37,6 +37,10 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [
 	ZFS_AC_KERNEL_INSERT_INODE_LOCKED
 	ZFS_AC_KERNEL_D_OBTAIN_ALIAS
 	ZFS_AC_KERNEL_CHECK_DISK_SIZE_CHANGE
+	ZFS_AC_KERNEL_TRUNCATE_SETSIZE
+	ZFS_AC_KERNEL_6ARGS_SECURITY_INODE_INIT_SECURITY
+	ZFS_AC_KERNEL_MOUNT_NODEV
+	ZFS_AC_KERNEL_BDI
 
 	if test "$LINUX_OBJ" != "$LINUX"; then
 		KERNELMAKE_PARAMS="$KERNELMAKE_PARAMS O=$LINUX_OBJ"
@@ -46,7 +50,7 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [
 
 	dnl # -Wall -fno-strict-aliasing -Wstrict-prototypes and other
 	dnl # compiler options are added by the kernel build system.
-	KERNELCPPFLAGS="$KERNELCPPFLAGS -Wno-unused-but-set-variable"
+	KERNELCPPFLAGS="$KERNELCPPFLAGS $NO_UNUSED_BUT_SET_VARIABLE"
 	KERNELCPPFLAGS="$KERNELCPPFLAGS -DHAVE_SPL -D_KERNEL"
 	KERNELCPPFLAGS="$KERNELCPPFLAGS -DTEXT_DOMAIN=\\\"zfs-linux-kernel\\\""
 
@@ -377,9 +381,7 @@ dnl #
 AC_DEFUN([ZFS_LINUX_CONFIG],
 	[AC_MSG_CHECKING([whether Linux was built with CONFIG_$1])
 	ZFS_LINUX_TRY_COMPILE([
-		#ifndef AUTOCONF_INCLUDED
-		#include <linux/config.h>
-		#endif
+		#include <linux/module.h>
 	],[
 		#ifndef CONFIG_$1
 		#error CONFIG_$1 not #defined