]> git.proxmox.com Git - mirror_spl-debian.git/blobdiff - config/spl-build.m4
Imported Upstream version 0.6.2
[mirror_spl-debian.git] / config / spl-build.m4
index 35cc8e4012358d7bd25f75a1015a2db624c16077..f54c5b166bb8eac72143d7d6988608dcbbecbc60 100644 (file)
@@ -1,39 +1,40 @@
-dnl #
-dnl # Default SPL kernel configuration
-dnl #
+###############################################################################
+# Copyright (C) 2007-2010 Lawrence Livermore National Security, LLC.
+# Copyright (C) 2007 The Regents of the University of California.
+# Written by Brian Behlendorf <behlendorf1@llnl.gov>.
+###############################################################################
+# SPL_AC_CONFIG_KERNEL: Default SPL kernel configuration.
+###############################################################################
+
 AC_DEFUN([SPL_AC_CONFIG_KERNEL], [
        SPL_AC_KERNEL
 
-       dnl # Kernel build make options
-       dnl # KERNELMAKE_PARAMS="V=1"   # Enable verbose module build
-       KERNELMAKE_PARAMS="V=1"
-
-       dnl # -Wall -fno-strict-aliasing -Wstrict-prototypes and other
-       dnl # compiler options are added by the kernel build system.
-       abs_srcdir=`readlink -f ${srcdir}`
-       KERNELCPPFLAGS="$KERNELCPPFLAGS -Wstrict-prototypes -Werror"
-       KERNELCPPFLAGS="$KERNELCPPFLAGS -I${abs_srcdir} -I${abs_srcdir}/include"
-
        if test "${LINUX_OBJ}" != "${LINUX}"; then
                KERNELMAKE_PARAMS="$KERNELMAKE_PARAMS O=$LINUX_OBJ"
        fi
-
        AC_SUBST(KERNELMAKE_PARAMS)
+
+       KERNELCPPFLAGS="$KERNELCPPFLAGS -Wstrict-prototypes"
        AC_SUBST(KERNELCPPFLAGS)
 
        SPL_AC_DEBUG
+       SPL_AC_DEBUG_LOG
        SPL_AC_DEBUG_KMEM
-       SPL_AC_DEBUG_MUTEX
-       SPL_AC_DEBUG_KSTAT
-       SPL_AC_DEBUG_CALLB
+       SPL_AC_DEBUG_KMEM_TRACKING
+       SPL_AC_TEST_MODULE
+       SPL_AC_ATOMIC_SPINLOCK
+       SPL_AC_TYPE_ATOMIC64_CMPXCHG
+       SPL_AC_TYPE_ATOMIC64_XCHG
        SPL_AC_TYPE_UINTPTR_T
-       SPL_AC_TYPE_ATOMIC64_T
-       SPL_AC_3ARGS_INIT_WORK
        SPL_AC_2ARGS_REGISTER_SYSCTL
        SPL_AC_SET_SHRINKER
+       SPL_AC_3ARGS_SHRINKER_CALLBACK
        SPL_AC_PATH_IN_NAMEIDATA
        SPL_AC_TASK_CURR
        SPL_AC_CTL_UNNUMBERED
+       SPL_AC_CTL_NAME
+       SPL_AC_VMALLOC_INFO
+       SPL_AC_PDE_DATA
        SPL_AC_FLS64
        SPL_AC_DEVICE_CREATE
        SPL_AC_5ARGS_DEVICE_CREATE
@@ -42,15 +43,13 @@ AC_DEFUN([SPL_AC_CONFIG_KERNEL], [
        SPL_AC_SET_NORMALIZED_TIMESPEC_INLINE
        SPL_AC_TIMESPEC_SUB
        SPL_AC_INIT_UTSNAME
-       SPL_AC_FDTABLE_HEADER
-       SPL_AC_FILES_FDTABLE
        SPL_AC_UACCESS_HEADER
        SPL_AC_KMALLOC_NODE
        SPL_AC_MONOTONIC_CLOCK
        SPL_AC_INODE_I_MUTEX
+       SPL_AC_MUTEX_OWNER
+       SPL_AC_MUTEX_OWNER_TASK_STRUCT
        SPL_AC_MUTEX_LOCK_NESTED
-       SPL_AC_DIV64_64
-       SPL_AC_DIV64_U64
        SPL_AC_3ARGS_ON_EACH_CPU
        SPL_AC_KALLSYMS_LOOKUP_NAME
        SPL_AC_GET_VMALLOC_INFO
@@ -59,22 +58,60 @@ AC_DEFUN([SPL_AC_CONFIG_KERNEL], [
        SPL_AC_NEXT_ONLINE_PGDAT
        SPL_AC_NEXT_ZONE
        SPL_AC_PGDAT_LIST
-       SPL_AC_GET_ZONE_COUNTS
        SPL_AC_GLOBAL_PAGE_STATE
-       SPL_AC_ZONE_STAT_ITEM_FIA
+       SPL_AC_ZONE_STAT_ITEM_FREE
+       SPL_AC_ZONE_STAT_ITEM_INACTIVE
+       SPL_AC_ZONE_STAT_ITEM_ACTIVE
+       SPL_AC_GET_ZONE_COUNTS
+       SPL_AC_USER_PATH_DIR
+       SPL_AC_SET_FS_PWD
+       SPL_AC_SET_FS_PWD_WITH_CONST
        SPL_AC_2ARGS_VFS_UNLINK
        SPL_AC_4ARGS_VFS_RENAME
+       SPL_AC_VFS_FSYNC
+       SPL_AC_2ARGS_VFS_FSYNC
+       SPL_AC_INODE_TRUNCATE_RANGE
+       SPL_AC_FS_STRUCT_SPINLOCK
+       SPL_AC_CRED_STRUCT
+       SPL_AC_KUIDGID_T
+       SPL_AC_GROUPS_SEARCH
+       SPL_AC_PUT_TASK_STRUCT
+       SPL_AC_5ARGS_PROC_HANDLER
+       SPL_AC_KVASPRINTF
+       SPL_AC_EXPORTED_RWSEM_IS_LOCKED
+       SPL_AC_KERNEL_FALLOCATE
+       SPL_AC_SHRINK_DCACHE_MEMORY
+       SPL_AC_SHRINK_ICACHE_MEMORY
+       SPL_AC_KERN_PATH_PARENT_HEADER
+       SPL_AC_KERN_PATH_PARENT_SYMBOL
+       SPL_AC_KERN_PATH_LOCKED
+       SPL_AC_CONFIG_KALLSYMS
+       SPL_AC_CONFIG_ZLIB_INFLATE
+       SPL_AC_CONFIG_ZLIB_DEFLATE
+       SPL_AC_2ARGS_ZLIB_DEFLATE_WORKSPACESIZE
+       SPL_AC_SHRINK_CONTROL_STRUCT
+       SPL_AC_RWSEM_SPINLOCK_IS_RAW
+       SPL_AC_SCHED_RT_HEADER
+       SPL_AC_2ARGS_VFS_GETATTR
 ])
 
 AC_DEFUN([SPL_AC_MODULE_SYMVERS], [
        modpost=$LINUX/scripts/Makefile.modpost
        AC_MSG_CHECKING([kernel file name for module symbols])
-       if test -f "$modpost"; then
+       if test "x$enable_linux_builtin" != xyes -a -f "$modpost"; then
                if grep -q Modules.symvers $modpost; then
                        LINUX_SYMBOLS=Modules.symvers
                else
                        LINUX_SYMBOLS=Module.symvers
                fi
+
+               if ! test -f "$LINUX_OBJ/$LINUX_SYMBOLS"; then
+                       AC_MSG_ERROR([
+       *** Please make sure the kernel devel package for your distribution
+       *** is installed.  If you are building with a custom kernel, make sure the
+       *** kernel is configured, built, and the '--with-linux=PATH' configure
+       *** option refers to the location of the kernel source.])
+               fi
        else
                LINUX_SYMBOLS=NONE
        fi
@@ -95,16 +132,22 @@ AC_DEFUN([SPL_AC_KERNEL], [
 
        AC_MSG_CHECKING([kernel source directory])
        if test -z "$kernelsrc"; then
-               sourcelink=`ls -1d /usr/src/kernels/* /usr/src/linux-* \
-                            2>/dev/null | grep -v obj | tail -1`
+               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/* \
+                                    /usr/src/linux-* \
+                                    2>/dev/null | grep -v obj | tail -1)
+               fi
 
-               if test -e ${sourcelink}; then
+               if test -n "$sourcelink" && test -e ${sourcelink}; then
                        kernelsrc=`readlink -f ${sourcelink}`
                else
-                       AC_MSG_RESULT([Not found])
-                       AC_MSG_ERROR([
-                       *** Please specify the location of the kernel source
-                       *** with the '--with-linux=PATH' option])
+                       kernelsrc="[Not found]"
                fi
        else
                if test "$kernelsrc" = "NONE"; then
@@ -113,14 +156,23 @@ AC_DEFUN([SPL_AC_KERNEL], [
        fi
 
        AC_MSG_RESULT([$kernelsrc])
+       if test ! -d "$kernelsrc"; then
+               AC_MSG_ERROR([
+       *** Please make sure the kernel devel package for your distribution
+       *** is installed and then try again.  If that fails, you can specify the
+       *** location of the kernel source with the '--with-linux=PATH' option.])
+       fi
+
        AC_MSG_CHECKING([kernel build directory])
        if test -z "$kernelbuild"; then
-               if test -d ${kernelsrc}-obj/`arch`/`arch`; then
-                       kernelbuild=${kernelsrc}-obj/`arch`/`arch`
-               elif test -d ${kernelsrc}-obj/`arch`/default; then
-                       kernelbuild=${kernelsrc}-obj/`arch`/default
-               elif test -d `dirname ${kernelsrc}`/build-`arch`; then
-                       kernelbuild=`dirname ${kernelsrc}`/build-`arch`
+               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
+               elif test -d `dirname ${kernelsrc}`/build-${target_cpu}; then
+                       kernelbuild=`dirname ${kernelsrc}`/build-${target_cpu}
                else
                        kernelbuild=${kernelsrc}
                fi
@@ -128,28 +180,36 @@ AC_DEFUN([SPL_AC_KERNEL], [
        AC_MSG_RESULT([$kernelbuild])
 
        AC_MSG_CHECKING([kernel source version])
-       if test -r $kernelbuild/include/linux/version.h && 
-               fgrep -q UTS_RELEASE $kernelbuild/include/linux/version.h; then
-
-               kernsrcver=`(echo "#include <linux/version.h>"; 
-                            echo "kernsrcver=UTS_RELEASE") | 
-                            cpp -I $kernelbuild/include |
-                            grep "^kernsrcver=" | cut -d \" -f 2`
-
-       elif test -r $kernelbuild/include/linux/utsrelease.h && 
-               fgrep -q UTS_RELEASE $kernelbuild/include/linux/utsrelease.h; then
+       utsrelease1=$kernelbuild/include/linux/version.h
+       utsrelease2=$kernelbuild/include/linux/utsrelease.h
+       utsrelease3=$kernelbuild/include/generated/utsrelease.h
+       if test -r $utsrelease1 && fgrep -q UTS_RELEASE $utsrelease1; then
+               utsrelease=linux/version.h
+       elif test -r $utsrelease2 && fgrep -q UTS_RELEASE $utsrelease2; then
+               utsrelease=linux/utsrelease.h
+       elif test -r $utsrelease3 && fgrep -q UTS_RELEASE $utsrelease3; then
+               utsrelease=generated/utsrelease.h
+       fi
 
-               kernsrcver=`(echo "#include <linux/utsrelease.h>"; 
+       if test "$utsrelease"; then
+               kernsrcver=`(echo "#include <$utsrelease>";
                             echo "kernsrcver=UTS_RELEASE") | 
                             cpp -I $kernelbuild/include |
                             grep "^kernsrcver=" | cut -d \" -f 2`
-       fi
 
-       if test -z "$kernsrcver"; then
+               if test -z "$kernsrcver"; then
+                       AC_MSG_RESULT([Not found])
+                       AC_MSG_ERROR([*** Cannot determine kernel version.])
+               fi
+       else
                AC_MSG_RESULT([Not found])
-               AC_MSG_ERROR([
-               *** Cannot determine the version of the linux kernel source.
-               *** Please prepare the kernel before running this script])
+               if test "x$enable_linux_builtin" != xyes; then
+                       AC_MSG_ERROR([*** Cannot find UTS_RELEASE definition.])
+               else
+                       AC_MSG_ERROR([
+       *** Cannot find UTS_RELEASE definition.
+       *** Please run 'make prepare' inside the kernel source tree.])
+               fi
        fi
 
        AC_MSG_RESULT([$kernsrcver])
@@ -170,6 +230,202 @@ dnl # Default SPL user configuration
 dnl #
 AC_DEFUN([SPL_AC_CONFIG_USER], [])
 
+dnl #
+dnl # Check for rpm+rpmbuild to build RPM packages.  If these tools
+dnl # are missing, it is non-fatal, but you will not be able to build
+dnl # RPM packages and will be warned if you try too.
+dnl #
+dnl # By default, the generic spec file will be used because it requires
+dnl # minimal dependencies.  Distribution specific spec files can be
+dnl # placed under the 'rpm/<distribution>' directory and enabled using
+dnl # the --with-spec=<distribution> configure option.
+dnl #
+AC_DEFUN([SPL_AC_RPM], [
+       RPM=rpm
+       RPMBUILD=rpmbuild
+
+       AC_MSG_CHECKING([whether $RPM is available])
+       AS_IF([tmp=$($RPM --version 2>/dev/null)], [
+               RPM_VERSION=$(echo $tmp | $AWK '/RPM/ { print $[3] }')
+               HAVE_RPM=yes
+               AC_MSG_RESULT([$HAVE_RPM ($RPM_VERSION)])
+       ],[
+               HAVE_RPM=no
+               AC_MSG_RESULT([$HAVE_RPM])
+       ])
+
+       AC_MSG_CHECKING([whether $RPMBUILD is available])
+       AS_IF([tmp=$($RPMBUILD --version 2>/dev/null)], [
+               RPMBUILD_VERSION=$(echo $tmp | $AWK '/RPM/ { print $[3] }')
+               HAVE_RPMBUILD=yes
+               AC_MSG_RESULT([$HAVE_RPMBUILD ($RPMBUILD_VERSION)])
+       ],[
+               HAVE_RPMBUILD=no
+               AC_MSG_RESULT([$HAVE_RPMBUILD])
+       ])
+
+       RPM_DEFINE_COMMON='--define "$(DEBUG_SPL) 1" --define "$(DEBUG_LOG) 1" --define "$(DEBUG_KMEM) 1" --define "$(DEBUG_KMEM_TRACKING) 1"'
+       RPM_DEFINE_UTIL=
+       RPM_DEFINE_KMOD='--define "kernels $(LINUX_VERSION)"'
+       RPM_DEFINE_DKMS=
+
+       SRPM_DEFINE_COMMON='--define "build_src_rpm 1"'
+       SRPM_DEFINE_UTIL=
+       SRPM_DEFINE_KMOD=
+       SRPM_DEFINE_DKMS=
+
+       RPM_SPEC_DIR="rpm/generic"
+       AC_ARG_WITH([spec],
+               AS_HELP_STRING([--with-spec=SPEC],
+               [Spec files 'generic|fedora']),
+               [RPM_SPEC_DIR="rpm/$withval"])
+
+       AC_MSG_CHECKING([whether spec files are available])
+       AC_MSG_RESULT([yes ($RPM_SPEC_DIR/*.spec.in)])
+
+       AC_SUBST(HAVE_RPM)
+       AC_SUBST(RPM)
+       AC_SUBST(RPM_VERSION)
+
+       AC_SUBST(HAVE_RPMBUILD)
+       AC_SUBST(RPMBUILD)
+       AC_SUBST(RPMBUILD_VERSION)
+
+       AC_SUBST(RPM_SPEC_DIR)
+       AC_SUBST(RPM_DEFINE_UTIL)
+       AC_SUBST(RPM_DEFINE_KMOD)
+       AC_SUBST(RPM_DEFINE_DKMS)
+       AC_SUBST(RPM_DEFINE_COMMON)
+       AC_SUBST(SRPM_DEFINE_UTIL)
+       AC_SUBST(SRPM_DEFINE_KMOD)
+       AC_SUBST(SRPM_DEFINE_DKMS)
+       AC_SUBST(SRPM_DEFINE_COMMON)
+])
+
+dnl #
+dnl # Check for dpkg+dpkg-buildpackage to build DEB packages.  If these
+dnl # tools are missing it is non-fatal but you will not be able to build
+dnl # DEB packages and will be warned if you try too.
+dnl #
+AC_DEFUN([SPL_AC_DPKG], [
+       DPKG=dpkg
+       DPKGBUILD=dpkg-buildpackage
+
+       AC_MSG_CHECKING([whether $DPKG is available])
+       AS_IF([tmp=$($DPKG --version 2>/dev/null)], [
+               DPKG_VERSION=$(echo $tmp | $AWK '/Debian/ { print $[7] }')
+               HAVE_DPKG=yes
+               AC_MSG_RESULT([$HAVE_DPKG ($DPKG_VERSION)])
+       ],[
+               HAVE_DPKG=no
+               AC_MSG_RESULT([$HAVE_DPKG])
+       ])
+
+       AC_MSG_CHECKING([whether $DPKGBUILD is available])
+       AS_IF([tmp=$($DPKGBUILD --version 2>/dev/null)], [
+               DPKGBUILD_VERSION=$(echo $tmp | \
+                   $AWK '/Debian/ { print $[4] }' | cut -f-4 -d'.')
+               HAVE_DPKGBUILD=yes
+               AC_MSG_RESULT([$HAVE_DPKGBUILD ($DPKGBUILD_VERSION)])
+       ],[
+               HAVE_DPKGBUILD=no
+               AC_MSG_RESULT([$HAVE_DPKGBUILD])
+       ])
+
+       AC_SUBST(HAVE_DPKG)
+       AC_SUBST(DPKG)
+       AC_SUBST(DPKG_VERSION)
+
+       AC_SUBST(HAVE_DPKGBUILD)
+       AC_SUBST(DPKGBUILD)
+       AC_SUBST(DPKGBUILD_VERSION)
+])
+
+dnl #
+dnl # Until native packaging for various different packing systems
+dnl # can be added the least we can do is attempt to use alien to
+dnl # convert the RPM packages to the needed package type.  This is
+dnl # a hack but so far it has worked reasonable well.
+dnl #
+AC_DEFUN([SPL_AC_ALIEN], [
+       ALIEN=alien
+
+       AC_MSG_CHECKING([whether $ALIEN is available])
+       AS_IF([tmp=$($ALIEN --version 2>/dev/null)], [
+               ALIEN_VERSION=$(echo $tmp | $AWK '{ print $[3] }')
+               HAVE_ALIEN=yes
+               AC_MSG_RESULT([$HAVE_ALIEN ($ALIEN_VERSION)])
+       ],[
+               HAVE_ALIEN=no
+               AC_MSG_RESULT([$HAVE_ALIEN])
+       ])
+
+       AC_SUBST(HAVE_ALIEN)
+       AC_SUBST(ALIEN)
+       AC_SUBST(ALIEN_VERSION)
+])
+
+dnl #
+dnl # Using the VENDOR tag from config.guess set the default
+dnl # package type for 'make pkg': (rpm | deb | tgz)
+dnl #
+AC_DEFUN([SPL_AC_DEFAULT_PACKAGE], [
+       AC_MSG_CHECKING([linux distribution])
+       if test -f /etc/toss-release ; then
+               VENDOR=toss ;
+       elif test -f /etc/fedora-release ; then
+               VENDOR=fedora ;
+       elif test -f /etc/redhat-release ; then
+               VENDOR=redhat ;
+       elif test -f /etc/gentoo-release ; then
+               VENDOR=gentoo ;
+       elif test -f /etc/arch-release ; then
+               VENDOR=arch ;
+       elif test -f /etc/SuSE-release ; then
+               VENDOR=sles ;
+       elif test -f /etc/slackware-version ; then
+               VENDOR=slackware ;
+       elif test -f /etc/lunar.release ; then
+               VENDOR=lunar ;
+       elif test -f /etc/lsb-release ; then
+               VENDOR=ubuntu ;
+       elif test -f /etc/debian_version ; then
+               VENDOR=debian ;
+       else
+               VENDOR= ;
+       fi
+       AC_MSG_RESULT([$VENDOR])
+       AC_SUBST(VENDOR)
+
+       AC_MSG_CHECKING([default package type])
+       case "$VENDOR" in
+               toss)       DEFAULT_PACKAGE=rpm  ;;
+               redhat)     DEFAULT_PACKAGE=rpm  ;;
+               fedora)     DEFAULT_PACKAGE=rpm  ;;
+               gentoo)     DEFAULT_PACKAGE=tgz  ;;
+               arch)       DEFAULT_PACKAGE=tgz  ;;
+               sles)       DEFAULT_PACKAGE=rpm  ;;
+               slackware)  DEFAULT_PACKAGE=tgz  ;;
+               lunar)      DEFAULT_PACKAGE=tgz  ;;
+               ubuntu)     DEFAULT_PACKAGE=deb  ;;
+               debian)     DEFAULT_PACKAGE=deb  ;;
+               *)          DEFAULT_PACKAGE=rpm  ;;
+       esac
+
+       AC_MSG_RESULT([$DEFAULT_PACKAGE])
+       AC_SUBST(DEFAULT_PACKAGE)
+])
+
+dnl #
+dnl # Default SPL user configuration
+dnl #
+AC_DEFUN([SPL_AC_PACKAGE], [
+       SPL_AC_DEFAULT_PACKAGE
+       SPL_AC_RPM
+       SPL_AC_DPKG
+       SPL_AC_ALIEN
+])
+
 AC_DEFUN([SPL_AC_LICENSE], [
        AC_MSG_CHECKING([spl license])
        LICENSE=GPL
@@ -179,149 +435,166 @@ AC_DEFUN([SPL_AC_LICENSE], [
 ])
 
 AC_DEFUN([SPL_AC_CONFIG], [
-        SPL_CONFIG=all
-        AC_ARG_WITH([config],
-                AS_HELP_STRING([--with-config=CONFIG],
-                [Config file 'kernel|user|all']),
-                [SPL_CONFIG="$withval"])
-
-        AC_MSG_CHECKING([spl config])
-        AC_MSG_RESULT([$SPL_CONFIG]);
-        AC_SUBST(SPL_CONFIG)
-
-        case "$SPL_CONFIG" in
-                kernel) SPL_AC_CONFIG_KERNEL ;;
-                user)   SPL_AC_CONFIG_USER   ;;
-                all)    SPL_AC_CONFIG_KERNEL
-                        SPL_AC_CONFIG_USER   ;;
-                *)
-                AC_MSG_RESULT([Error!])
-                AC_MSG_ERROR([Bad value "$SPL_CONFIG" for --with-config,
-                              user kernel|user|all]) ;;
-        esac
-
-        AM_CONDITIONAL([CONFIG_USER],
-                       [test "$SPL_CONFIG" = user] ||
-                       [test "$SPL_CONFIG" = all])
-        AM_CONDITIONAL([CONFIG_KERNEL],
-                       [test "$SPL_CONFIG" = kernel] ||
-                       [test "$SPL_CONFIG" = all])
+       SPL_CONFIG=all
+       AC_ARG_WITH([config],
+               AS_HELP_STRING([--with-config=CONFIG],
+               [Config file 'kernel|user|all|srpm']),
+               [SPL_CONFIG="$withval"])
+       AC_ARG_ENABLE([linux-builtin],
+               [AC_HELP_STRING([--enable-linux-builtin],
+               [Configure for builtin in-tree kernel modules @<:@default=no@:>@])],
+               [],
+               [enable_linux_builtin=no])
+
+       AC_MSG_CHECKING([spl config])
+       AC_MSG_RESULT([$SPL_CONFIG]);
+       AC_SUBST(SPL_CONFIG)
+
+       case "$SPL_CONFIG" in
+               kernel) SPL_AC_CONFIG_KERNEL ;;
+               user)   SPL_AC_CONFIG_USER   ;;
+               all)    SPL_AC_CONFIG_KERNEL
+                       SPL_AC_CONFIG_USER   ;;
+               srpm)                        ;;
+               *)
+               AC_MSG_RESULT([Error!])
+               AC_MSG_ERROR([Bad value "$SPL_CONFIG" for --with-config,
+                            user kernel|user|all|srpm]) ;;
+       esac
+
+       AM_CONDITIONAL([CONFIG_USER],
+                      [test "$SPL_CONFIG" = user -o "$SPL_CONFIG" = all])
+       AM_CONDITIONAL([CONFIG_KERNEL],
+                      [test "$SPL_CONFIG" = kernel -o "$SPL_CONFIG" = all] &&
+                      [test "x$enable_linux_builtin" != xyes ])
 ])
 
+dnl #
+dnl # Enable if the SPL should be compiled with internal debugging enabled.
+dnl # By default this support is disabled.
+dnl #
 AC_DEFUN([SPL_AC_DEBUG], [
        AC_MSG_CHECKING([whether debugging is enabled])
-       AC_ARG_ENABLE( [debug],
-               AS_HELP_STRING([--enable-debug],
-               [Enable generic debug support (default off)]),
-               [ case "$enableval" in
-                       yes) spl_ac_debug=yes ;;
-                       no)  spl_ac_debug=no  ;;
-                       *) AC_MSG_RESULT([Error!])
-                       AC_MSG_ERROR([Bad value "$enableval" for --enable-debug]) ;;
-               esac ]
-       ) 
-       if test "$spl_ac_debug" = yes; then
-               AC_MSG_RESULT([yes])
-               KERNELCPPFLAGS="${KERNELCPPFLAGS} -DDEBUG"
-       else
-               AC_MSG_RESULT([no])
+       AC_ARG_ENABLE([debug],
+               [AS_HELP_STRING([--enable-debug],
+               [Enable generic debug support @<:@default=no@:>@])],
+               [],
+               [enable_debug=no])
+
+       AS_IF([test "x$enable_debug" = xyes],
+       [
+               KERNELCPPFLAGS="${KERNELCPPFLAGS} -DDEBUG -Werror"
+               DEBUG_CFLAGS="-DDEBUG -Werror"
+               DEBUG_SPL="_with_debug"
+       ], [
                KERNELCPPFLAGS="${KERNELCPPFLAGS} -DNDEBUG"
-       fi
+               DEBUG_CFLAGS="-DNDEBUG"
+               DEBUG_SPL="_without_debug"
+       ])
+
+       AC_SUBST(DEBUG_CFLAGS)
+       AC_SUBST(DEBUG_SPL)
+       AC_MSG_RESULT([$enable_debug])
+])
+
+dnl #
+dnl # Enabled by default it provides a basic debug log infrastructure.
+dnl # Each subsystem registers itself with a name and logs messages
+dnl # using predefined types.  If the debug mask it set to allow the
+dnl # message type it will be written to the internal log.  The log
+dnl # can be dumped to a file by echoing 1 to the 'dump' proc entry,
+dnl # after dumping the log it must be decoded using the spl utility.
+dnl #
+dnl # echo 1 >/proc/sys/kernel/spl/debug/dump
+dnl # spl /tmp/spl-log.xxx.yyy /tmp/spl-log.xxx.yyy.txt
+dnl #
+AC_DEFUN([SPL_AC_DEBUG_LOG], [
+       AC_ARG_ENABLE([debug-log],
+               [AS_HELP_STRING([--enable-debug-log],
+               [Enable basic debug logging @<:@default=yes@:>@])],
+               [],
+               [enable_debug_log=yes])
+
+       AS_IF([test "x$enable_debug_log" = xyes],
+       [
+               KERNELCPPFLAGS="${KERNELCPPFLAGS} -DDEBUG_LOG"
+               DEBUG_LOG="_with_debug_log"
+               AC_DEFINE([DEBUG_LOG], [1],
+               [Define to 1 to enable basic debug logging])
+       ], [
+               DEBUG_LOG="_without_debug_log"
+       ])
+
+       AC_SUBST(DEBUG_LOG)
+       AC_MSG_CHECKING([whether basic debug logging is enabled])
+       AC_MSG_RESULT([$enable_debug_log])
 ])
 
+dnl #
+dnl # Enabled by default it provides a minimal level of memory tracking.
+dnl # A total count of bytes allocated is kept for each alloc and free.
+dnl # Then at module unload time a report to the console will be printed
+dnl # if memory was leaked.  Additionally, /proc/spl/kmem/slab will exist
+dnl # and provide an easy way to inspect the kmem based slab.
+dnl #
 AC_DEFUN([SPL_AC_DEBUG_KMEM], [
-       AC_MSG_CHECKING([whether kmem debugging is enabled])
-       AC_ARG_ENABLE( [debug-kmem],
-               AS_HELP_STRING([--enable-debug-kmem],
-               [Enable kmem debug support (default off)]),
-               [ case "$enableval" in
-                       yes) spl_ac_debug_kmem=yes ;;
-                       no)  spl_ac_debug_kmem=no  ;;
-                       *) AC_MSG_RESULT([Error!])
-                       AC_MSG_ERROR([Bad value "$enableval" for --enable-debug-kmem]) ;;
-               esac ]
-       ) 
-       if test "$spl_ac_debug_kmem" = yes; then
-               AC_MSG_RESULT([yes])
-               AC_DEFINE([DEBUG_KMEM], [1],
-               [Define to 1 to enable kmem debugging])
+       AC_ARG_ENABLE([debug-kmem],
+               [AS_HELP_STRING([--enable-debug-kmem],
+               [Enable basic kmem accounting @<:@default=yes@:>@])],
+               [],
+               [enable_debug_kmem=yes])
+
+       AS_IF([test "x$enable_debug_kmem" = xyes],
+       [
                KERNELCPPFLAGS="${KERNELCPPFLAGS} -DDEBUG_KMEM"
-       else
-               AC_MSG_RESULT([no])
-       fi
-])
+               DEBUG_KMEM="_with_debug_kmem"
+               AC_DEFINE([DEBUG_KMEM], [1],
+               [Define to 1 to enable basic kmem accounting])
+       ], [
+               DEBUG_KMEM="_without_debug_kmem"
+       ])
 
-AC_DEFUN([SPL_AC_DEBUG_MUTEX], [
-       AC_MSG_CHECKING([whether mutex debugging is enabled])
-       AC_ARG_ENABLE( [debug-mutex],
-               AS_HELP_STRING([--enable-debug-mutex],
-               [Enable mutex debug support (default off)]),
-               [ case "$enableval" in
-                       yes) spl_ac_debug_mutex=yes ;;
-                       no)  spl_ac_debug_mutex=no  ;;
-                       *) AC_MSG_RESULT([Error!])
-                       AC_MSG_ERROR([Bad value "$enableval" for --enable-debug-mutex]) ;;
-               esac ]
-       ) 
-       if test "$spl_ac_debug_mutex" = yes; then
-               AC_MSG_RESULT([yes])
-               AC_DEFINE([DEBUG_MUTEX], [1],
-               [Define to 1 to enable mutex debugging])
-               KERNELCPPFLAGS="${KERNELCPPFLAGS} -DDEBUG_MUTEX"
-       else
-               AC_MSG_RESULT([no])
-       fi
+       AC_SUBST(DEBUG_KMEM)
+       AC_MSG_CHECKING([whether basic kmem accounting is enabled])
+       AC_MSG_RESULT([$enable_debug_kmem])
 ])
 
-AC_DEFUN([SPL_AC_DEBUG_KSTAT], [
-       AC_MSG_CHECKING([whether kstat debugging is enabled])
-       AC_ARG_ENABLE( [debug-kstat],
-               AS_HELP_STRING([--enable-debug-kstat],
-               [Enable kstat debug support (default off)]),
-               [ case "$enableval" in
-                       yes) spl_ac_debug_kstat=yes ;;
-                       no)  spl_ac_debug_kstat=no  ;;
-                       *) AC_MSG_RESULT([Error!])
-                       AC_MSG_ERROR([Bad value "$enableval" for --enable-debug-kstat]) ;;
-               esac ]
-       ) 
-       if test "$spl_ac_debug_kstat" = yes; then
-               AC_MSG_RESULT([yes])
-               AC_DEFINE([DEBUG_KSTAT], [1],
-               [Define to 1 to enable kstat debugging])
-               KERNELCPPFLAGS="${KERNELCPPFLAGS} -DDEBUG_KSTAT"
-       else
-               AC_MSG_RESULT([no])
-       fi
-])
+dnl #
+dnl # Disabled by default it provides detailed memory tracking.  This
+dnl # feature also requires --enable-debug-kmem to be set.  When enabled
+dnl # not only will total bytes be tracked but also the location of every
+dnl # alloc and free.  When the SPL module is unloaded a list of all leaked
+dnl # addresses and where they were allocated will be dumped to the console.
+dnl # Enabling this feature has a significant impact on performance but it
+dnl # makes finding memory leaks pretty straight forward.
+dnl #
+AC_DEFUN([SPL_AC_DEBUG_KMEM_TRACKING], [
+       AC_ARG_ENABLE([debug-kmem-tracking],
+               [AS_HELP_STRING([--enable-debug-kmem-tracking],
+               [Enable detailed kmem tracking  @<:@default=no@:>@])],
+               [],
+               [enable_debug_kmem_tracking=no])
 
-AC_DEFUN([SPL_AC_DEBUG_CALLB], [
-       AC_MSG_CHECKING([whether callb debugging is enabled])
-       AC_ARG_ENABLE( [debug-callb],
-               AS_HELP_STRING([--enable-debug-callb],
-               [Enable callb debug support (default off)]),
-               [ case "$enableval" in
-                       yes) spl_ac_debug_callb=yes ;;
-                       no)  spl_ac_debug_callb=no  ;;
-                       *) AC_MSG_RESULT([Error!])
-                       AC_MSG_ERROR([Bad value "$enableval" for --enable-debug-callb]) ;;
-               esac ]
-       ) 
-       if test "$spl_ac_debug_callb" = yes; then
-               AC_MSG_RESULT([yes])
-               AC_DEFINE([DEBUG_CALLB], [1],
-               [Define to 1 to enable callb debugging])
-               KERNELCPPFLAGS="${KERNELCPPFLAGS} -DDEBUG_CALLB"
-       else
-               AC_MSG_RESULT([no])
-       fi
+       AS_IF([test "x$enable_debug_kmem_tracking" = xyes],
+       [
+               KERNELCPPFLAGS="${KERNELCPPFLAGS} -DDEBUG_KMEM_TRACKING"
+               DEBUG_KMEM_TRACKING="_with_debug_kmem_tracking"
+               AC_DEFINE([DEBUG_KMEM_TRACKING], [1],
+               [Define to 1 to enable detailed kmem tracking])
+       ], [
+               DEBUG_KMEM_TRACKING="_without_debug_kmem_tracking"
+       ])
+
+       AC_SUBST(DEBUG_KMEM_TRACKING)
+       AC_MSG_CHECKING([whether detailed kmem tracking is enabled])
+       AC_MSG_RESULT([$enable_debug_kmem_tracking])
 ])
 
 dnl #
 dnl # SPL_LINUX_CONFTEST
 dnl #
 AC_DEFUN([SPL_LINUX_CONFTEST], [
-cat >conftest.c <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.c
 $1
 _ACEOF
 ])
@@ -347,12 +620,14 @@ dnl # SPL_LINUX_COMPILE_IFELSE / like AC_COMPILE_IFELSE
 dnl #
 AC_DEFUN([SPL_LINUX_COMPILE_IFELSE], [
        m4_ifvaln([$1], [SPL_LINUX_CONFTEST([$1])])
-       rm -Rf build && mkdir -p build
+       rm -Rf build && mkdir -p build && touch build/conftest.mod.c
        echo "obj-m := conftest.o" >build/Makefile
+       modpost_flag=''
+       test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage
        AS_IF(
-               [AC_TRY_COMMAND(cp conftest.c build && make [$2] -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build) >/dev/null && AC_TRY_COMMAND([$3])],
-               [$4],
-               [_AC_MSG_LOG_CONFTEST m4_ifvaln([$5],[$5])]
+               [AC_TRY_COMMAND(cp conftest.c build && make [$2] -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag) >/dev/null && AC_TRY_COMMAND([$3])],
+               [$4],
+               [_AC_MSG_LOG_CONFTEST m4_ifvaln([$5],[$5])]
        )
        rm -Rf build
 ])
@@ -368,34 +643,11 @@ AC_DEFUN([SPL_LINUX_TRY_COMPILE],
        [$3], [$4])
 ])
 
-dnl #
-dnl # SPL_LINUX_CONFIG
-dnl #
-AC_DEFUN([SPL_LINUX_CONFIG],
-       [AC_MSG_CHECKING([whether Linux was built with CONFIG_$1])
-       SPL_LINUX_TRY_COMPILE([
-               #ifndef AUTOCONF_INCLUDED
-               #include <linux/config.h>
-               #endif
-       ],[
-               #ifndef CONFIG_$1
-               #error CONFIG_$1 not #defined
-               #endif
-       ],[
-               AC_MSG_RESULT([yes])
-               $2
-       ],[
-               AC_MSG_RESULT([no])
-               $3
-       ])
-])
-
 dnl #
 dnl # SPL_CHECK_SYMBOL_EXPORT
 dnl # check symbol exported or not
 dnl #
-AC_DEFUN([SPL_CHECK_SYMBOL_EXPORT],
-       [AC_MSG_CHECKING([whether symbol $1 is exported])
+AC_DEFUN([SPL_CHECK_SYMBOL_EXPORT], [
        grep -q -E '[[[:space:]]]$1[[[:space:]]]' \
                $LINUX_OBJ/Module*.symvers 2>/dev/null
        rc=$?
@@ -405,21 +657,63 @@ AC_DEFUN([SPL_CHECK_SYMBOL_EXPORT],
                        grep -q -E "EXPORT_SYMBOL.*($1)" \
                                "$LINUX_OBJ/$file" 2>/dev/null
                        rc=$?
-                       if test $rc -eq 0; then
-                               export=1
-                               break;
-                       fi
+                       if test $rc -eq 0; then
+                               export=1
+                               break;
+                       fi
                done
-               if test $export -eq 0; then
-                       AC_MSG_RESULT([no])
+               if test $export -eq 0; then :
                        $4
-               else
-                       AC_MSG_RESULT([yes])
+               else :
                        $3
                fi
+       else :
+               $3
+       fi
+])
+
+dnl #
+dnl # SPL_LINUX_TRY_COMPILE_SYMBOL
+dnl # like SPL_LINUX_TRY_COMPILE, except SPL_CHECK_SYMBOL_EXPORT
+dnl # is called if not compiling for builtin
+dnl #
+AC_DEFUN([SPL_LINUX_TRY_COMPILE_SYMBOL], [
+       SPL_LINUX_TRY_COMPILE([$1], [$2], [rc=0], [rc=1])
+       if test $rc -ne 0; then :
+               $6
+       else
+               if test "x$enable_linux_builtin" != xyes; then
+                       SPL_CHECK_SYMBOL_EXPORT([$3], [$4], [rc=0], [rc=1])
+               fi
+               if test $rc -ne 0; then :
+                       $6
+               else :
+                       $5
+               fi
+       fi
+])
+
+dnl #
+dnl # SPL_CHECK_SYMBOL_HEADER
+dnl # check if a symbol prototype is defined in listed headers.
+dnl #
+AC_DEFUN([SPL_CHECK_SYMBOL_HEADER], [
+       AC_MSG_CHECKING([whether symbol $1 exists in header])
+       header=0
+       for file in $3; do
+               grep -q "$2" "$LINUX/$file" 2>/dev/null
+               rc=$?
+               if test $rc -eq 0; then
+                       header=1
+                       break;
+               fi
+       done
+       if test $header -eq 0; then
+               AC_MSG_RESULT([no])
+               $5
        else
                AC_MSG_RESULT([yes])
-               $3
+               $4
        fi
 ])
 
@@ -443,61 +737,131 @@ AC_DEFUN([SPL_CHECK_HEADER],
        ])
 ])
 
+dnl #
+dnl # Basic toolchain sanity check.
+dnl #
+AC_DEFUN([SPL_AC_TEST_MODULE],
+       [AC_MSG_CHECKING([whether modules can be built])
+       SPL_LINUX_TRY_COMPILE([],[],[
+               AC_MSG_RESULT([yes])
+       ],[
+               AC_MSG_RESULT([no])
+               if test "x$enable_linux_builtin" != xyes; then
+                       AC_MSG_ERROR([*** Unable to build an empty module.])
+               else
+                       AC_MSG_ERROR([
+       *** Unable to build an empty module.
+       *** Please run 'make scripts' inside the kernel source tree.])
+               fi
+       ])
+])
+
+dnl #
+dnl # Use the atomic implemenation based on global spinlocks.  This
+dnl # should only be needed by 32-bit kernels which do not provide
+dnl # the atomic64_* API.  It may be optionally enabled as a fallback
+dnl # if problems are observed with the direct mapping to the native
+dnl # Linux atomic operations.  You may not disable atomic spinlocks
+dnl # if you kernel does not an atomic64_* API.
+dnl #
+AC_DEFUN([SPL_AC_ATOMIC_SPINLOCK], [
+       AC_ARG_ENABLE([atomic-spinlocks],
+               [AS_HELP_STRING([--enable-atomic-spinlocks],
+               [Atomic types use spinlocks @<:@default=check@:>@])],
+               [],
+               [enable_atomic_spinlocks=check])
+
+       SPL_LINUX_TRY_COMPILE([
+               #include <linux/fs.h>
+       ],[
+               atomic64_t *ptr __attribute__ ((unused));
+       ],[
+               have_atomic64_t=yes
+               AC_DEFINE(HAVE_ATOMIC64_T, 1,
+                       [kernel defines atomic64_t])
+       ],[
+               have_atomic64_t=no
+       ])
+
+       AS_IF([test "x$enable_atomic_spinlocks" = xcheck], [
+               AS_IF([test "x$have_atomic64_t" = xyes], [
+                       enable_atomic_spinlocks=no
+               ],[
+                       enable_atomic_spinlocks=yes
+               ])
+       ])
+
+       AS_IF([test "x$enable_atomic_spinlocks" = xyes], [
+               AC_DEFINE([ATOMIC_SPINLOCK], [1],
+                       [Atomic types use spinlocks])
+       ],[
+               AS_IF([test "x$have_atomic64_t" = xno], [
+                       AC_MSG_FAILURE(
+                       [--disable-atomic-spinlocks given but required atomic64 support is unavailable])
+               ])
+       ])
+
+       AC_MSG_CHECKING([whether atomic types use spinlocks])
+       AC_MSG_RESULT([$enable_atomic_spinlocks])
+
+       AC_MSG_CHECKING([whether kernel defines atomic64_t])
+       AC_MSG_RESULT([$have_atomic64_t])
+])
+
 dnl #
 dnl # 2.6.24 API change,
-dnl # check if uintptr_t typedef is defined
+dnl # check if atomic64_cmpxchg is defined
 dnl #
-AC_DEFUN([SPL_AC_TYPE_UINTPTR_T],
-       [AC_MSG_CHECKING([whether kernel defines uintptr_t])
+AC_DEFUN([SPL_AC_TYPE_ATOMIC64_CMPXCHG],
+       [AC_MSG_CHECKING([whether kernel defines atomic64_cmpxchg])
        SPL_LINUX_TRY_COMPILE([
-               #include <linux/types.h>
+               #include <linux/fs.h>
        ],[
-               uintptr_t *ptr;
+               atomic64_cmpxchg((atomic64_t *)NULL, 0, 0);
        ],[
                AC_MSG_RESULT([yes])
-               AC_DEFINE(HAVE_UINTPTR_T, 1,
-                         [kernel defines uintptr_t])
+               AC_DEFINE(HAVE_ATOMIC64_CMPXCHG, 1,
+                         [kernel defines atomic64_cmpxchg])
        ],[
                AC_MSG_RESULT([no])
        ])
 ])
 
 dnl #
-dnl # 2.6.x API change,
-dnl # check if atomic64_t typedef is defined
+dnl # 2.6.24 API change,
+dnl # check if atomic64_xchg is defined
 dnl #
-AC_DEFUN([SPL_AC_TYPE_ATOMIC64_T],
-       [AC_MSG_CHECKING([whether kernel defines atomic64_t])
+AC_DEFUN([SPL_AC_TYPE_ATOMIC64_XCHG],
+       [AC_MSG_CHECKING([whether kernel defines atomic64_xchg])
        SPL_LINUX_TRY_COMPILE([
-               #include <asm/atomic.h>
+               #include <linux/fs.h>
        ],[
-               atomic64_t *ptr;
+               atomic64_xchg((atomic64_t *)NULL, 0);
        ],[
                AC_MSG_RESULT([yes])
-               AC_DEFINE(HAVE_ATOMIC64_T, 1,
-                         [kernel defines atomic64_t])
+               AC_DEFINE(HAVE_ATOMIC64_XCHG, 1,
+                         [kernel defines atomic64_xchg])
        ],[
                AC_MSG_RESULT([no])
        ])
 ])
 
 dnl #
-dnl # 2.6.20 API change,
-dnl # INIT_WORK use 2 args and not store data inside
+dnl # 2.6.24 API change,
+dnl # check if uintptr_t typedef is defined
 dnl #
-AC_DEFUN([SPL_AC_3ARGS_INIT_WORK],
-       [AC_MSG_CHECKING([whether INIT_WORK wants 3 args])
+AC_DEFUN([SPL_AC_TYPE_UINTPTR_T],
+       [AC_MSG_CHECKING([whether kernel defines uintptr_t])
        SPL_LINUX_TRY_COMPILE([
-               #include <linux/workqueue.h>
+               #include <linux/types.h>
        ],[
-               struct work_struct work;
-               INIT_WORK(&work, NULL, NULL);
+               uintptr_t *ptr __attribute__ ((unused));
        ],[
-               AC_MSG_RESULT(yes)
-               AC_DEFINE(HAVE_3ARGS_INIT_WORK, 1,
-                         [INIT_WORK wants 3 args])
+               AC_MSG_RESULT([yes])
+               AC_DEFINE(HAVE_UINTPTR_T, 1,
+                         [kernel defines uintptr_t])
        ],[
-               AC_MSG_RESULT(no)
+               AC_MSG_RESULT([no])
        ])
 ])
 
@@ -510,7 +874,7 @@ AC_DEFUN([SPL_AC_2ARGS_REGISTER_SYSCTL],
        SPL_LINUX_TRY_COMPILE([
                #include <linux/sysctl.h>
        ],[
-               return register_sysctl_table(NULL,0);
+               (void) register_sysctl_table(NULL, 0);
        ],[
                AC_MSG_RESULT(yes)
                AC_DEFINE(HAVE_2ARGS_REGISTER_SYSCTL, 1,
@@ -539,6 +903,34 @@ AC_DEFUN([SPL_AC_SET_SHRINKER], [
        ])
 ])
 
+dnl #
+dnl # 2.6.35 API change,
+dnl # Add context to shrinker callback
+dnl #
+AC_DEFUN([SPL_AC_3ARGS_SHRINKER_CALLBACK],
+       [AC_MSG_CHECKING([whether shrinker callback wants 3 args])
+       tmp_flags="$EXTRA_KCFLAGS"
+       EXTRA_KCFLAGS="-Werror"
+       SPL_LINUX_TRY_COMPILE([
+               #include <linux/mm.h>
+
+               int shrinker_cb(struct shrinker *, int, unsigned int);
+       ],[
+               struct shrinker cache_shrinker = {
+                       .shrink = shrinker_cb,
+                       .seeks = DEFAULT_SEEKS,
+               };
+               register_shrinker(&cache_shrinker);
+       ],[
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_3ARGS_SHRINKER_CALLBACK, 1,
+                         [shrinker callback wants 3 args])
+       ],[
+               AC_MSG_RESULT(no)
+       ])
+       EXTRA_KCFLAGS="$tmp_flags"
+])
+
 dnl #
 dnl # 2.6.25 API change,
 dnl # struct path entry added to struct nameidata
@@ -548,7 +940,7 @@ AC_DEFUN([SPL_AC_PATH_IN_NAMEIDATA],
        SPL_LINUX_TRY_COMPILE([
                #include <linux/namei.h>
        ],[
-               struct nameidata nd;
+               struct nameidata nd __attribute__ ((unused));
 
                nd.path.mnt = NULL;
                nd.path.dentry = NULL;
@@ -564,10 +956,18 @@ AC_DEFUN([SPL_AC_PATH_IN_NAMEIDATA],
 dnl #
 dnl # Custom SPL patch may export this system it is not required
 dnl #
-AC_DEFUN([SPL_AC_TASK_CURR], [
-       SPL_CHECK_SYMBOL_EXPORT([task_curr], [kernel/sched.c],
-               [AC_DEFINE(HAVE_TASK_CURR, 1, [task_curr() exported])],
-               [])
+AC_DEFUN([SPL_AC_TASK_CURR],
+       [AC_MSG_CHECKING([whether task_curr() is available])
+       SPL_LINUX_TRY_COMPILE_SYMBOL([
+               #include <linux/sched.h>
+       ], [
+               task_curr(NULL);
+       ], [task_curr], [kernel/sched.c], [
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_TASK_CURR, 1, [task_curr() is available])
+       ], [
+               AC_MSG_RESULT(no)
+       ])
 ])
 
 dnl #
@@ -591,6 +991,25 @@ AC_DEFUN([SPL_AC_CTL_UNNUMBERED],
        ])
 ])
 
+dnl #
+dnl # 2.6.33 API change,
+dnl # Removed .ctl_name from struct ctl_table.
+dnl #
+AC_DEFUN([SPL_AC_CTL_NAME], [
+       AC_MSG_CHECKING([whether struct ctl_table has ctl_name])
+       SPL_LINUX_TRY_COMPILE([
+               #include <linux/sysctl.h>
+       ],[
+               struct ctl_table ctl __attribute__ ((unused));
+               ctl.ctl_name = 0;
+       ],[
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_CTL_NAME, 1, [struct ctl_table has ctl_name])
+       ],[
+               AC_MSG_RESULT(no)
+       ])
+])
+
 dnl #
 dnl # 2.6.16 API change.
 dnl # Check if 'fls64()' is available
@@ -614,13 +1033,15 @@ dnl # 2.6.18 API change, check whether device_create() is available.
 dnl # Device_create() was introduced in 2.6.18 and depricated 
 dnl # class_device_create() which was fully removed in 2.6.26.
 dnl #
-AC_DEFUN([SPL_AC_DEVICE_CREATE], [
-       SPL_CHECK_SYMBOL_EXPORT(
-               [device_create],
-               [drivers/base/core.c],
-               [AC_DEFINE(HAVE_DEVICE_CREATE, 1,
-               [device_create() is available])],
-               [])
+AC_DEFUN([SPL_AC_DEVICE_CREATE],
+       [AC_MSG_CHECKING([whether device_create() is available])
+       SPL_CHECK_SYMBOL_EXPORT([device_create], [drivers/base/core.c], [
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_DEVICE_CREATE, 1,
+                         [device_create() is available])
+       ], [
+               AC_MSG_RESULT(no)
+       ])
 ])
 
 dnl #
@@ -650,25 +1071,37 @@ dnl # 2.6.13 API change, check whether class_device_create() is available.
 dnl # Class_device_create() was introduced in 2.6.13 and depricated
 dnl # class_simple_device_add() which was fully removed in 2.6.13.
 dnl #
-AC_DEFUN([SPL_AC_CLASS_DEVICE_CREATE], [
-       SPL_CHECK_SYMBOL_EXPORT(
-               [class_device_create],
-               [drivers/base/class.c],
-               [AC_DEFINE(HAVE_CLASS_DEVICE_CREATE, 1,
-               [class_device_create() is available])],
-               [])
-])
-
-dnl #
+AC_DEFUN([SPL_AC_CLASS_DEVICE_CREATE],
+       [AC_MSG_CHECKING([whether class_device_create() is available])
+       SPL_LINUX_TRY_COMPILE_SYMBOL([
+               #include <linux/device.h>
+       ], [
+               class_device_create(NULL, NULL, 0, NULL, NULL);
+       ], [class_device_create], [drivers/base/class.c], [
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_CLASS_DEVICE_CREATE, 1,
+                         [class_device_create() is available])
+       ], [
+               AC_MSG_RESULT(no)
+       ])
+])
+
+dnl #
 dnl # 2.6.26 API change, set_normalized_timespec() is exported.
 dnl #
-AC_DEFUN([SPL_AC_SET_NORMALIZED_TIMESPEC_EXPORT], [
-       SPL_CHECK_SYMBOL_EXPORT(
-               [set_normalized_timespec],
-               [kernel/time.c],
-               [AC_DEFINE(HAVE_SET_NORMALIZED_TIMESPEC_EXPORT, 1,
-               [set_normalized_timespec() is available as export])],
-               [])
+AC_DEFUN([SPL_AC_SET_NORMALIZED_TIMESPEC_EXPORT],
+       [AC_MSG_CHECKING([whether set_normalized_timespec() is available as export])
+       SPL_LINUX_TRY_COMPILE_SYMBOL([
+               #include <linux/time.h>
+       ], [
+               set_normalized_timespec(NULL, 0, 0);
+       ], [set_normalized_timespec], [kernel/time.c], [
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_SET_NORMALIZED_TIMESPEC_EXPORT, 1,
+                         [set_normalized_timespec() is available as export])
+       ], [
+               AC_MSG_RESULT(no)
+       ])
 ])
 
 dnl #
@@ -701,7 +1134,9 @@ AC_DEFUN([SPL_AC_TIMESPEC_SUB], [
        SPL_LINUX_TRY_COMPILE([
                #include <linux/time.h>
        ],[
-               struct timespec a, b, c = { 0 };
+               struct timespec a = { 0 };
+               struct timespec b = { 0 };
+               struct timespec c __attribute__ ((unused));
                c = timespec_sub(a, b);
        ],[
                AC_MSG_RESULT(yes)
@@ -720,7 +1155,8 @@ AC_DEFUN([SPL_AC_INIT_UTSNAME], [
        SPL_LINUX_TRY_COMPILE([
                #include <linux/utsname.h>
        ],[
-               struct new_utsname *a = init_utsname();
+               struct new_utsname *a __attribute__ ((unused));
+               a = init_utsname();
        ],[
                AC_MSG_RESULT(yes)
                AC_DEFINE(HAVE_INIT_UTSNAME, 1, [init_utsname() is available])
@@ -729,37 +1165,6 @@ AC_DEFUN([SPL_AC_INIT_UTSNAME], [
        ])
 ])
 
-dnl #
-dnl # 2.6.26 API change,
-dnl # definition of struct fdtable relocated to linux/fdtable.h
-dnl #
-AC_DEFUN([SPL_AC_FDTABLE_HEADER], [
-       SPL_CHECK_HEADER([linux/fdtable.h], [FDTABLE], [], [])
-])
-
-dnl #
-dnl # 2.6.14 API change,
-dnl # check whether 'files_fdtable()' exists
-dnl #
-AC_DEFUN([SPL_AC_FILES_FDTABLE], [
-       AC_MSG_CHECKING([whether files_fdtable() is available])
-       SPL_LINUX_TRY_COMPILE([
-               #include <linux/sched.h>
-               #include <linux/file.h>
-               #ifdef HAVE_FDTABLE_HEADER
-               #include <linux/fdtable.h>
-               #endif
-       ],[
-               struct files_struct *files = current->files;
-               struct fdtable *fdt = files_fdtable(files);
-       ],[
-               AC_MSG_RESULT(yes)
-               AC_DEFINE(HAVE_FILES_FDTABLE, 1, [files_fdtable() is available])
-       ],[
-               AC_MSG_RESULT(no)
-       ])
-])
-
 dnl #
 dnl # 2.6.18 API change,
 dnl # added linux/uaccess.h
@@ -777,7 +1182,8 @@ AC_DEFUN([SPL_AC_KMALLOC_NODE], [
        SPL_LINUX_TRY_COMPILE([
                #include <linux/slab.h>
        ],[
-               void *a = kmalloc_node(1, GFP_KERNEL, 0);
+               void *a __attribute__ ((unused));
+               a = kmalloc_node(1, GFP_KERNEL, 0);
        ],[
                AC_MSG_RESULT(yes)
                AC_DEFINE(HAVE_KMALLOC_NODE, 1, [kmalloc_node() is available])
@@ -791,13 +1197,19 @@ dnl # 2.6.9 API change,
 dnl # check whether 'monotonic_clock()' is available it may
 dnl # be available for some archs but not others.
 dnl #
-AC_DEFUN([SPL_AC_MONOTONIC_CLOCK], [
-       SPL_CHECK_SYMBOL_EXPORT(
-               [monotonic_clock],
-               [],
-               [AC_DEFINE(HAVE_MONOTONIC_CLOCK, 1,
-               [monotonic_clock() is available])],
-               [])
+AC_DEFUN([SPL_AC_MONOTONIC_CLOCK],
+       [AC_MSG_CHECKING([whether monotonic_clock() is available])
+       SPL_LINUX_TRY_COMPILE_SYMBOL([
+               #include <linux/timex.h>
+       ], [
+               monotonic_clock();
+       ], [monotonic_clock], [], [
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_MONOTONIC_CLOCK, 1,
+                         [monotonic_clock() is available])
+       ], [
+               AC_MSG_RESULT(no)
+       ])
 ])
 
 dnl #
@@ -820,6 +1232,52 @@ AC_DEFUN([SPL_AC_INODE_I_MUTEX], [
        ])
 ])
 
+dnl #
+dnl # 2.6.29 API change,
+dnl # Adaptive mutexs introduced.
+dnl #
+AC_DEFUN([SPL_AC_MUTEX_OWNER], [
+       AC_MSG_CHECKING([whether struct mutex has owner])
+       SPL_LINUX_TRY_COMPILE([
+               #include <linux/mutex.h>
+       ],[
+               struct mutex mtx __attribute__ ((unused));
+               mtx.owner = NULL;
+       ],[
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_MUTEX_OWNER, 1, [struct mutex has owner])
+       ],[
+               AC_MSG_RESULT(no)
+       ])
+])
+
+dnl #
+dnl # 2.6.39 API change,
+dnl # Owner type change.  A Linux mutex prior to 2.6.39 would store
+dnl # the owner as a thread_info pointer when CONFIG_DEBUG_MUTEXES
+dnl # was defined.  As of 2.6.39 this was changed to a task_struct
+dnl # pointer which frankly makes a lot more sense.
+dnl #
+AC_DEFUN([SPL_AC_MUTEX_OWNER_TASK_STRUCT], [
+       AC_MSG_CHECKING([whether struct mutex owner is a task_struct])
+       tmp_flags="$EXTRA_KCFLAGS"
+       EXTRA_KCFLAGS="-Werror"
+       SPL_LINUX_TRY_COMPILE([
+               #include <linux/mutex.h>
+               #include <linux/sched.h>
+       ],[
+               struct mutex mtx __attribute__ ((unused));
+               mtx.owner = current;
+       ],[
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_MUTEX_OWNER_TASK_STRUCT, 1,
+               [struct mutex owner is a task_struct])
+       ],[
+               AC_MSG_RESULT(no)
+       ])
+       EXTRA_KCFLAGS="$tmp_flags"
+])
+
 dnl #
 dnl # 2.6.18 API change,
 dnl # First introduced 'mutex_lock_nested()' in include/linux/mutex.h,
@@ -843,32 +1301,6 @@ AC_DEFUN([SPL_AC_MUTEX_LOCK_NESTED], [
        ])
 ])
 
-dnl #
-dnl # 2.6.22 API change,
-dnl # First introduced 'div64_64()' in lib/div64.c
-dnl 
-AC_DEFUN([SPL_AC_DIV64_64], [
-       SPL_CHECK_SYMBOL_EXPORT(
-               [div64_64],
-               [],
-               [AC_DEFINE(HAVE_DIV64_64, 1,
-               [div64_64() is available])],
-               [])
-])
-
-dnl #
-dnl # 2.6.26 API change,
-dnl # Renamed 'div64_64()' to 'div64_u64' in lib/div64.c
-dnl #
-AC_DEFUN([SPL_AC_DIV64_U64], [
-       SPL_CHECK_SYMBOL_EXPORT(
-               [div64_u64],
-               [],
-               [AC_DEFINE(HAVE_DIV64_U64, 1,
-               [div64_u64() is available])],
-               [])
-])
-
 dnl #
 dnl # 2.6.27 API change,
 dnl # on_each_cpu() uses 3 args, no 'retry' argument
@@ -876,9 +1308,12 @@ dnl #
 AC_DEFUN([SPL_AC_3ARGS_ON_EACH_CPU], [
        AC_MSG_CHECKING([whether on_each_cpu() wants 3 args])
        SPL_LINUX_TRY_COMPILE([
+               #include <linux/interrupt.h>
                #include <linux/smp.h>
+
+               void on_each_cpu_func(void *data) { return; }
        ],[
-               on_each_cpu(NULL, NULL, 0);
+               on_each_cpu(on_each_cpu_func, NULL, 0);
        ],[
                AC_MSG_RESULT(yes)
                AC_DEFINE(HAVE_3ARGS_ON_EACH_CPU, 1,
@@ -892,13 +1327,19 @@ dnl #
 dnl # 2.6.18 API change,
 dnl # kallsyms_lookup_name no longer exported
 dnl #
-AC_DEFUN([SPL_AC_KALLSYMS_LOOKUP_NAME], [
-       SPL_CHECK_SYMBOL_EXPORT(
-               [kallsyms_lookup_name],
-               [],
-               [AC_DEFINE(HAVE_KALLSYMS_LOOKUP_NAME, 1,
-               [kallsyms_lookup_name() is available])],
-               [])
+AC_DEFUN([SPL_AC_KALLSYMS_LOOKUP_NAME],
+       [AC_MSG_CHECKING([whether kallsyms_lookup_name() is available])
+       SPL_LINUX_TRY_COMPILE_SYMBOL([
+               #include <linux/kallsyms.h>
+       ], [
+               kallsyms_lookup_name(NULL);
+       ], [kallsyms_lookup_name], [], [
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_KALLSYMS_LOOKUP_NAME, 1,
+                         [kallsyms_lookup_name() is available])
+       ], [
+               AC_MSG_RESULT(no)
+       ])
 ])
 
 dnl #
@@ -908,13 +1349,52 @@ dnl # custom kernel with the *-spl-export-symbols.patch which will export
 dnl # these symbols for use.  If your already rolling a custom kernel for
 dnl # your environment this is recommended.
 dnl #
-AC_DEFUN([SPL_AC_GET_VMALLOC_INFO], [
-       SPL_CHECK_SYMBOL_EXPORT(
-               [get_vmalloc_info],
-               [],
-               [AC_DEFINE(HAVE_GET_VMALLOC_INFO, 1,
-               [get_vmalloc_info() is available])],
-               [])
+AC_DEFUN([SPL_AC_GET_VMALLOC_INFO],
+       [AC_MSG_CHECKING([whether get_vmalloc_info() is available])
+       SPL_CHECK_SYMBOL_EXPORT([get_vmalloc_info], [], [
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_GET_VMALLOC_INFO, 1,
+                         [get_vmalloc_info() is available])
+       ], [
+               AC_MSG_RESULT(no)
+       ])
+])
+
+dnl #
+dnl # 3.10 API change,
+dnl # struct vmalloc_info is now declared in linux/vmalloc.h
+dnl #
+AC_DEFUN([SPL_AC_VMALLOC_INFO], [
+       AC_MSG_CHECKING([whether struct vmalloc_info is declared])
+       SPL_LINUX_TRY_COMPILE([
+               #include <linux/vmalloc.h>
+               struct vmalloc_info { void *a; };
+       ],[
+               return 0;
+       ],[
+               AC_MSG_RESULT(no)
+       ],[
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_VMALLOC_INFO, 1, [yes])
+       ])
+])
+
+dnl #
+dnl # 3.10 API change,
+dnl # PDE is replaced by PDE_DATA
+dnl #
+AC_DEFUN([SPL_AC_PDE_DATA], [
+       AC_MSG_CHECKING([whether PDE_DATA() is available])
+       SPL_LINUX_TRY_COMPILE_SYMBOL([
+               #include <linux/proc_fs.h>
+       ], [
+               PDE_DATA(NULL);
+       ], [PDE_DATA], [], [
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_PDE_DATA, 1, [yes])
+       ],[
+               AC_MSG_RESULT(no)
+       ])
 ])
 
 dnl #
@@ -936,7 +1416,7 @@ AC_DEFUN([SPL_AC_PGDAT_HELPERS], [
        rc=$?
        if test $rc -eq 0; then
                AC_MSG_RESULT([yes])
-                AC_DEFINE(HAVE_PGDAT_HELPERS, 1, [pgdat helpers are available])
+               AC_DEFINE(HAVE_PGDAT_HELPERS, 1, [pgdat helpers are available])
        else
                AC_MSG_RESULT([no])
        fi
@@ -949,13 +1429,19 @@ dnl # custom kernel with the *-spl-export-symbols.patch which will export
 dnl # these symbols for use.  If your already rolling a custom kernel for
 dnl # your environment this is recommended.
 dnl #
-AC_DEFUN([SPL_AC_FIRST_ONLINE_PGDAT], [
-       SPL_CHECK_SYMBOL_EXPORT(
-               [first_online_pgdat],
-               [],
-               [AC_DEFINE(HAVE_FIRST_ONLINE_PGDAT, 1,
-               [first_online_pgdat() is available])],
-               [])
+AC_DEFUN([SPL_AC_FIRST_ONLINE_PGDAT],
+       [AC_MSG_CHECKING([whether first_online_pgdat() is available])
+       SPL_LINUX_TRY_COMPILE_SYMBOL([
+               #include <linux/mmzone.h>
+       ], [
+               first_online_pgdat();
+       ], [first_online_pgdat], [], [
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_FIRST_ONLINE_PGDAT, 1,
+                         [first_online_pgdat() is available])
+       ], [
+               AC_MSG_RESULT(no)
+       ])
 ])
 
 dnl #
@@ -965,13 +1451,19 @@ dnl # custom kernel with the *-spl-export-symbols.patch which will export
 dnl # these symbols for use.  If your already rolling a custom kernel for
 dnl # your environment this is recommended.
 dnl #
-AC_DEFUN([SPL_AC_NEXT_ONLINE_PGDAT], [
-       SPL_CHECK_SYMBOL_EXPORT(
-               [next_online_pgdat],
-               [],
-               [AC_DEFINE(HAVE_NEXT_ONLINE_PGDAT, 1,
-               [next_online_pgdat() is available])],
-               [])
+AC_DEFUN([SPL_AC_NEXT_ONLINE_PGDAT],
+       [AC_MSG_CHECKING([whether next_online_pgdat() is available])
+       SPL_LINUX_TRY_COMPILE_SYMBOL([
+               #include <linux/mmzone.h>
+       ], [
+               next_online_pgdat(NULL);
+       ], [next_online_pgdat], [], [
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_NEXT_ONLINE_PGDAT, 1,
+                         [next_online_pgdat() is available])
+       ], [
+               AC_MSG_RESULT(no)
+       ])
 ])
 
 dnl #
@@ -981,42 +1473,35 @@ dnl # custom kernel with the *-spl-export-symbols.patch which will export
 dnl # these symbols for use.  If your already rolling a custom kernel for
 dnl # your environment this is recommended.
 dnl #
-AC_DEFUN([SPL_AC_NEXT_ZONE], [
-       SPL_CHECK_SYMBOL_EXPORT(
-               [next_zone],
-               [],
-               [AC_DEFINE(HAVE_NEXT_ZONE, 1,
-               [next_zone() is available])],
-               [])
+AC_DEFUN([SPL_AC_NEXT_ZONE],
+       [AC_MSG_CHECKING([whether next_zone() is available])
+       SPL_LINUX_TRY_COMPILE_SYMBOL([
+               #include <linux/mmzone.h>
+       ], [
+               next_zone(NULL);
+       ], [next_zone], [], [
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_NEXT_ZONE, 1, [next_zone() is available])
+       ], [
+               AC_MSG_RESULT(no)
+       ])
 ])
 
 dnl #
 dnl # 2.6.17 API change,
 dnl # See SPL_AC_PGDAT_HELPERS for details.
 dnl #
-AC_DEFUN([SPL_AC_PGDAT_LIST], [
-       SPL_CHECK_SYMBOL_EXPORT(
-               [pgdat_list],
-               [],
-               [AC_DEFINE(HAVE_PGDAT_LIST, 1,
-               [pgdat_list is available])],
-               [])
-])
-
-dnl #
-dnl # Proposed API change,
-dnl # This symbol is not available in stock kernels.  You may build a
-dnl # custom kernel with the *-spl-export-symbols.patch which will export
-dnl # these symbols for use.  If your already rolling a custom kernel for
-dnl # your environment this is recommended.
-dnl #
-AC_DEFUN([SPL_AC_GET_ZONE_COUNTS], [
-       SPL_CHECK_SYMBOL_EXPORT(
-               [get_zone_counts],
-               [],
-               [AC_DEFINE(HAVE_GET_ZONE_COUNTS, 1,
-               [get_zone_counts() is available])],
-               [])
+AC_DEFUN([SPL_AC_PGDAT_LIST],
+       [AC_MSG_CHECKING([whether pgdat_list is available])
+       SPL_LINUX_TRY_COMPILE_SYMBOL([
+               #include <linux/topology.h>
+               pg_data_t *tmp = pgdat_list;
+       ], [], [pgdat_list], [], [
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_PGDAT_LIST, 1, [pgdat_list is available])
+       ], [
+               AC_MSG_RESULT(no)
+       ])
 ])
 
 dnl #
@@ -1026,10 +1511,10 @@ dnl #
 AC_DEFUN([SPL_AC_GLOBAL_PAGE_STATE], [
        AC_MSG_CHECKING([whether global_page_state() is available])
        SPL_LINUX_TRY_COMPILE([
-               #include <linux/vmstat.h>
+               #include <linux/mm.h>
        ],[
-               unsigned long state;
-               state = global_page_state(NR_FREE_PAGES);
+               unsigned long state __attribute__ ((unused));
+               state = global_page_state(0);
        ],[
                AC_MSG_RESULT(yes)
                AC_DEFINE(HAVE_GLOBAL_PAGE_STATE, 1,
@@ -1040,26 +1525,264 @@ AC_DEFUN([SPL_AC_GLOBAL_PAGE_STATE], [
 ])
 
 dnl #
-dnl # 2.6.21 API change,
-dnl # Public global zone stats now include free/inactive/active page
-dnl # counts.  This replaced the priviate get_zone_counts() interface.
+dnl # 2.6.21 API change (plus subsequent naming convention changes),
+dnl # Public global zone stats now include a free page count.  However
+dnl # the enumerated names of the counters have changed since this API
+dnl # was introduced.  We need to deduce the corrent name to use.  This
+dnl # replaces the priviate get_zone_counts() interface.
+dnl #
+dnl # NR_FREE_PAGES was available from 2.6.21 to current kernels, which
+dnl # is 2.6.30 as of when this was written.
 dnl #
-AC_DEFUN([SPL_AC_ZONE_STAT_ITEM_FIA], [
-       AC_MSG_CHECKING([whether free/inactive/active page state is available])
+AC_DEFUN([SPL_AC_ZONE_STAT_ITEM_FREE], [
+       AC_MSG_CHECKING([whether page state NR_FREE_PAGES is available])
        SPL_LINUX_TRY_COMPILE([
-               #include <linux/mmzone.h>
+               #include <linux/mm.h>
+       ],[
+               enum zone_stat_item zsi __attribute__ ((unused));
+               zsi = NR_FREE_PAGES;
+       ],[
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_ZONE_STAT_ITEM_NR_FREE_PAGES, 1,
+                         [Page state NR_FREE_PAGES is available])
+       ],[
+               AC_MSG_RESULT(no)
+       ])
+])
+
+dnl #
+dnl # 2.6.21 API change (plus subsequent naming convention changes),
+dnl # Public global zone stats now include an inactive page count.  However
+dnl # the enumerated names of the counters have changed since this API
+dnl # was introduced.  We need to deduce the corrent name to use.  This
+dnl # replaces the priviate get_zone_counts() interface.
+dnl #
+dnl # NR_INACTIVE was available from 2.6.21 to 2.6.27 and included both
+dnl # anonymous and file inactive pages.  As of 2.6.28 it was split in
+dnl # to NR_INACTIVE_ANON and NR_INACTIVE_FILE.
+dnl #
+AC_DEFUN([SPL_AC_ZONE_STAT_ITEM_INACTIVE], [
+       AC_MSG_CHECKING([whether page state NR_INACTIVE is available])
+       SPL_LINUX_TRY_COMPILE([
+               #include <linux/mm.h>
+       ],[
+               enum zone_stat_item zsi __attribute__ ((unused));
+               zsi = NR_INACTIVE;
+       ],[
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_ZONE_STAT_ITEM_NR_INACTIVE, 1,
+                         [Page state NR_INACTIVE is available])
+       ],[
+               AC_MSG_RESULT(no)
+       ])
+
+       AC_MSG_CHECKING([whether page state NR_INACTIVE_ANON is available])
+       SPL_LINUX_TRY_COMPILE([
+               #include <linux/mm.h>
+       ],[
+               enum zone_stat_item zsi __attribute__ ((unused));
+               zsi = NR_INACTIVE_ANON;
+       ],[
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_ZONE_STAT_ITEM_NR_INACTIVE_ANON, 1,
+                         [Page state NR_INACTIVE_ANON is available])
+       ],[
+               AC_MSG_RESULT(no)
+       ])
+
+       AC_MSG_CHECKING([whether page state NR_INACTIVE_FILE is available])
+       SPL_LINUX_TRY_COMPILE([
+               #include <linux/mm.h>
+       ],[
+               enum zone_stat_item zsi __attribute__ ((unused));
+               zsi = NR_INACTIVE_FILE;
+       ],[
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_ZONE_STAT_ITEM_NR_INACTIVE_FILE, 1,
+                         [Page state NR_INACTIVE_FILE is available])
+       ],[
+               AC_MSG_RESULT(no)
+       ])
+])
+
+dnl #
+dnl # 2.6.21 API change (plus subsequent naming convention changes),
+dnl # Public global zone stats now include an active page count.  However
+dnl # the enumerated names of the counters have changed since this API
+dnl # was introduced.  We need to deduce the corrent name to use.  This
+dnl # replaces the priviate get_zone_counts() interface.
+dnl #
+dnl # NR_ACTIVE was available from 2.6.21 to 2.6.27 and included both
+dnl # anonymous and file active pages.  As of 2.6.28 it was split in
+dnl # to NR_ACTIVE_ANON and NR_ACTIVE_FILE.
+dnl #
+AC_DEFUN([SPL_AC_ZONE_STAT_ITEM_ACTIVE], [
+       AC_MSG_CHECKING([whether page state NR_ACTIVE is available])
+       SPL_LINUX_TRY_COMPILE([
+               #include <linux/mm.h>
+       ],[
+               enum zone_stat_item zsi __attribute__ ((unused));
+               zsi = NR_ACTIVE;
+       ],[
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_ZONE_STAT_ITEM_NR_ACTIVE, 1,
+                         [Page state NR_ACTIVE is available])
+       ],[
+               AC_MSG_RESULT(no)
+       ])
+
+       AC_MSG_CHECKING([whether page state NR_ACTIVE_ANON is available])
+       SPL_LINUX_TRY_COMPILE([
+               #include <linux/mm.h>
+       ],[
+               enum zone_stat_item zsi __attribute__ ((unused));
+               zsi = NR_ACTIVE_ANON;
+       ],[
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_ZONE_STAT_ITEM_NR_ACTIVE_ANON, 1,
+                         [Page state NR_ACTIVE_ANON is available])
        ],[
-               enum zone_stat_item i1, i2, i3;
-               i1 = NR_FREE_PAGES;
-               i2 = NR_INACTIVE;
-               i3 = NR_ACTIVE;
+               AC_MSG_RESULT(no)
+       ])
+
+       AC_MSG_CHECKING([whether page state NR_ACTIVE_FILE is available])
+       SPL_LINUX_TRY_COMPILE([
+               #include <linux/mm.h>
+       ],[
+               enum zone_stat_item zsi __attribute__ ((unused));
+               zsi = NR_ACTIVE_FILE;
        ],[
                AC_MSG_RESULT(yes)
-               AC_DEFINE(HAVE_ZONE_STAT_ITEM_FIA, 1,
-                         [free/inactive/active page state is available])
+               AC_DEFINE(HAVE_ZONE_STAT_ITEM_NR_ACTIVE_FILE, 1,
+                         [Page state NR_ACTIVE_FILE is available])
+       ],[
+               AC_MSG_RESULT(no)
+       ])
+])
+
+dnl #
+dnl # Proposed API change for legacy kernels.
+dnl # This symbol is not available in older kernels.  For kernels post
+dnl # 2.6.21 the global_page_state() API is used to get free/inactive/active
+dnl # page state information.  This symbol is only used in legacy kernels
+dnl # any only as a last resort.
+dnl
+AC_DEFUN([SPL_AC_GET_ZONE_COUNTS], [
+       AC_MSG_CHECKING([whether symbol get_zone_counts is needed])
+       SPL_LINUX_TRY_COMPILE([
+       ],[
+               #if !defined(HAVE_ZONE_STAT_ITEM_NR_FREE_PAGES)
+               #error "global_page_state needs NR_FREE_PAGES"
+               #endif
+
+               #if !defined(HAVE_ZONE_STAT_ITEM_NR_ACTIVE) && \
+                   !defined(HAVE_ZONE_STAT_ITEM_NR_ACTIVE_ANON) && \
+                   !defined(HAVE_ZONE_STAT_ITEM_NR_ACTIVE_FILE)
+               #error "global_page_state needs NR_ACTIVE*"
+               #endif
+
+               #if !defined(HAVE_ZONE_STAT_ITEM_NR_INACTIVE) && \
+                   !defined(HAVE_ZONE_STAT_ITEM_NR_INACTIVE_ANON) && \
+                   !defined(HAVE_ZONE_STAT_ITEM_NR_INACTIVE_FILE)
+               #error "global_page_state needs NR_INACTIVE*"
+               #endif
        ],[
                AC_MSG_RESULT(no)
+       ],[
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(NEED_GET_ZONE_COUNTS, 1,
+                         [get_zone_counts() is needed])
+
+               AC_MSG_CHECKING([whether get_zone_counts() is available])
+               SPL_LINUX_TRY_COMPILE_SYMBOL([
+                       #include <linux/mmzone.h>
+               ], [
+                       get_zone_counts(NULL, NULL, NULL);
+               ], [get_zone_counts], [], [
+                       AC_MSG_RESULT(yes)
+                       AC_DEFINE(HAVE_GET_ZONE_COUNTS, 1,
+                                 [get_zone_counts() is available])
+               ], [
+                       AC_MSG_RESULT(no)
+               ])
+       ])
+])
+
+dnl #
+dnl # 2.6.27 API change,
+dnl # The user_path_dir() replaces __user_walk()
+dnl #
+AC_DEFUN([SPL_AC_USER_PATH_DIR],
+       [AC_MSG_CHECKING([whether user_path_dir() is available])
+       SPL_LINUX_TRY_COMPILE_SYMBOL([
+               #include <linux/fcntl.h>
+               #include <linux/namei.h>
+       ], [
+               user_path_dir(NULL, NULL);
+       ], [user_path_at], [], [
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_USER_PATH_DIR, 1, [user_path_dir() is available])
+       ], [
+               AC_MSG_RESULT(no)
+       ])
+])
+
+dnl #
+dnl # Symbol available in RHEL kernels not in stock kernels.
+dnl #
+AC_DEFUN([SPL_AC_SET_FS_PWD],
+       [AC_MSG_CHECKING([whether set_fs_pwd() is available])
+       SPL_LINUX_TRY_COMPILE_SYMBOL([
+               #include <linux/spinlock.h>
+               #include <linux/fs_struct.h>
+       ], [
+               (void) set_fs_pwd;
+       ], [set_fs_pwd], [], [
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_SET_FS_PWD, 1, [set_fs_pwd() is available])
+       ], [
+               AC_MSG_RESULT(no)
+       ])
+])
+
+dnl #
+dnl # 3.9 API change
+dnl # set_fs_pwd takes const struct path *
+dnl #
+AC_DEFUN([SPL_AC_SET_FS_PWD_WITH_CONST],
+       tmp_flags="$EXTRA_KCFLAGS"
+       EXTRA_KCFLAGS="-Werror"
+       [AC_MSG_CHECKING([whether set_fs_pwd() requires const struct path *])
+       SPL_LINUX_TRY_COMPILE([
+               #include <linux/spinlock.h>
+               #include <linux/fs_struct.h>
+               #include <linux/path.h>
+               void (*const set_fs_pwd_func)
+                       (struct fs_struct *, const struct path *)
+                       = set_fs_pwd;
+       ],[
+               return 0;
+       ],[
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_SET_FS_PWD_WITH_CONST, 1,
+                       [set_fs_pwd() needs const path *])
+       ],[
+               SPL_LINUX_TRY_COMPILE([
+                       #include <linux/spinlock.h>
+                       #include <linux/fs_struct.h>
+                       #include <linux/path.h>
+                       void (*const set_fs_pwd_func)
+                               (struct fs_struct *, struct path *)
+                               = set_fs_pwd;
+               ],[
+                       return 0;
+               ],[
+                       AC_MSG_RESULT(no)
+               ],[
+                       AC_MSG_ERROR(unknown)
+               ])
        ])
+       EXTRA_KCFLAGS="$tmp_flags"
 ])
 
 dnl #
@@ -1099,3 +1822,581 @@ AC_DEFUN([SPL_AC_4ARGS_VFS_RENAME],
                AC_MSG_RESULT(no)
        ])
 ])
+
+dnl #
+dnl # 2.6.36 API change,
+dnl # The 'struct fs_struct->lock' was changed from a rwlock_t to
+dnl # a spinlock_t to improve the fastpath performance.
+dnl #
+AC_DEFUN([SPL_AC_FS_STRUCT_SPINLOCK], [
+       AC_MSG_CHECKING([whether struct fs_struct uses spinlock_t])
+       tmp_flags="$EXTRA_KCFLAGS"
+       EXTRA_KCFLAGS="-Werror"
+       SPL_LINUX_TRY_COMPILE([
+               #include <linux/sched.h>
+               #include <linux/fs_struct.h>
+       ],[
+               struct fs_struct fs;
+               spin_lock_init(&fs.lock);
+       ],[
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_FS_STRUCT_SPINLOCK, 1,
+                         [struct fs_struct uses spinlock_t])
+       ],[
+               AC_MSG_RESULT(no)
+       ])
+       EXTRA_KCFLAGS="$tmp_flags"
+])
+
+dnl #
+dnl # 2.6.29 API change,
+dnl # check whether 'struct cred' exists
+dnl #
+AC_DEFUN([SPL_AC_CRED_STRUCT], [
+       AC_MSG_CHECKING([whether struct cred exists])
+       SPL_LINUX_TRY_COMPILE([
+               #include <linux/cred.h>
+       ],[
+               struct cred *cr __attribute__ ((unused));
+               cr  = NULL;
+       ],[
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_CRED_STRUCT, 1, [struct cred exists])
+       ],[
+               AC_MSG_RESULT(no)
+       ])
+])
+
+
+dnl #
+dnl # User namespaces, use kuid_t in place of uid_t
+dnl # where available. Not strictly a user namespaces thing
+dnl # but it should prevent surprises
+dnl #
+AC_DEFUN([SPL_AC_KUIDGID_T], [
+       AC_MSG_CHECKING([whether kuid_t/kgid_t is available])
+       SPL_LINUX_TRY_COMPILE([
+               #include <linux/uidgid.h>
+       ], [
+               kuid_t userid = KUIDT_INIT(0);
+               kgid_t groupid = KGIDT_INIT(0);
+       ],[
+               SPL_LINUX_TRY_COMPILE([
+                       #include <linux/uidgid.h>
+               ], [
+                       kuid_t userid = 0;
+                       kgid_t groupid = 0;
+               ],[
+                       AC_MSG_RESULT(yes; optional)
+               ],[
+                       AC_MSG_RESULT(yes; mandatory)
+                       AC_DEFINE(HAVE_KUIDGID_T, 1, [kuid_t/kgid_t in use])
+               ])
+       ],[
+               AC_MSG_RESULT(no)
+       ])
+])
+
+dnl #
+dnl # Custom SPL patch may export this symbol.
+dnl #
+AC_DEFUN([SPL_AC_GROUPS_SEARCH],
+       [AC_MSG_CHECKING([whether groups_search() is available])
+       SPL_LINUX_TRY_COMPILE_SYMBOL([
+               #include <linux/cred.h>
+               #ifdef HAVE_KUIDGID_T
+               #include <linux/uidgid.h>
+               #endif
+       ], [
+               #ifdef HAVE_KUIDGID_T
+               groups_search(NULL, KGIDT_INIT(0));
+               #else
+               groups_search(NULL, 0);
+               #endif
+       ], [groups_search], [], [
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_GROUPS_SEARCH, 1, [groups_search() is available])
+       ], [
+               AC_MSG_RESULT(no)
+       ])
+])
+
+dnl #
+dnl # 2.6.x API change,
+dnl # __put_task_struct() was exported in RHEL5 but unavailable elsewhere.
+dnl #
+AC_DEFUN([SPL_AC_PUT_TASK_STRUCT],
+       [AC_MSG_CHECKING([whether __put_task_struct() is available])
+       SPL_LINUX_TRY_COMPILE_SYMBOL([
+               #include <linux/sched.h>
+       ], [
+               __put_task_struct(NULL);
+       ], [__put_task_struct], [], [
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_PUT_TASK_STRUCT, 1,
+                         [__put_task_struct() is available])
+       ], [
+               AC_MSG_RESULT(no)
+       ])
+])
+
+dnl #
+dnl # 2.6.32 API change,
+dnl # Unused 'struct file *' removed from prototype.
+dnl #
+AC_DEFUN([SPL_AC_5ARGS_PROC_HANDLER], [
+       AC_MSG_CHECKING([whether proc_handler() wants 5 args])
+       SPL_LINUX_TRY_COMPILE([
+               #include <linux/sysctl.h>
+       ],[
+               proc_dostring(NULL, 0, NULL, NULL, NULL);
+       ],[
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_5ARGS_PROC_HANDLER, 1,
+                         [proc_handler() wants 5 args])
+       ],[
+               AC_MSG_RESULT(no)
+       ])
+])
+
+dnl #
+dnl # 2.6.x API change,
+dnl # kvasprintf() function added.
+dnl #
+AC_DEFUN([SPL_AC_KVASPRINTF],
+       [AC_MSG_CHECKING([whether kvasprintf() is available])
+       SPL_LINUX_TRY_COMPILE_SYMBOL([
+               #include <linux/kernel.h>
+       ], [
+               kvasprintf(0, NULL, *((va_list*)NULL));
+       ], [kvasprintf], [], [
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_KVASPRINTF, 1, [kvasprintf() is available])
+       ], [
+               AC_MSG_RESULT(no)
+       ])
+])
+
+dnl #
+dnl # 2.6.29 API change,
+dnl # vfs_fsync() funcation added, prior to this use file_fsync().
+dnl #
+AC_DEFUN([SPL_AC_VFS_FSYNC],
+       [AC_MSG_CHECKING([whether vfs_fsync() is available])
+       SPL_LINUX_TRY_COMPILE_SYMBOL([
+               #include <linux/fs.h>
+       ], [
+               (void) vfs_fsync;
+       ], [vfs_fsync], [fs/sync.c], [
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_VFS_FSYNC, 1, [vfs_fsync() is available])
+       ], [
+               AC_MSG_RESULT(no)
+       ])
+])
+
+dnl #
+dnl # 2.6.35 API change,
+dnl # Unused 'struct dentry *' removed from vfs_fsync() prototype.
+dnl #
+AC_DEFUN([SPL_AC_2ARGS_VFS_FSYNC], [
+       AC_MSG_CHECKING([whether vfs_fsync() wants 2 args])
+       SPL_LINUX_TRY_COMPILE([
+               #include <linux/fs.h>
+       ],[
+               vfs_fsync(NULL, 0);
+       ],[
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_2ARGS_VFS_FSYNC, 1, [vfs_fsync() wants 2 args])
+       ],[
+               AC_MSG_RESULT(no)
+       ])
+])
+
+dnl #
+dnl # 3.5 API change,
+dnl # inode_operations.truncate_range removed
+dnl #
+AC_DEFUN([SPL_AC_INODE_TRUNCATE_RANGE], [
+       AC_MSG_CHECKING([whether truncate_range() inode operation is available])
+       SPL_LINUX_TRY_COMPILE([
+               #include <linux/fs.h>
+       ],[
+               struct inode_operations ops;
+               ops.truncate_range = NULL;
+       ],[
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_INODE_TRUNCATE_RANGE, 1,
+                       [truncate_range() inode operation is available])
+       ],[
+               AC_MSG_RESULT(no)
+       ])
+])
+
+dnl #
+dnl # Linux 2.6.38 - 3.x API
+dnl #
+AC_DEFUN([SPL_AC_KERNEL_FILE_FALLOCATE], [
+       AC_MSG_CHECKING([whether fops->fallocate() exists])
+       SPL_LINUX_TRY_COMPILE([
+               #include <linux/fs.h>
+       ],[
+               long (*fallocate) (struct file *, int, loff_t, loff_t) = NULL;
+               struct file_operations fops __attribute__ ((unused)) = {
+                       .fallocate = fallocate,
+               };
+       ],[
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_FILE_FALLOCATE, 1, [fops->fallocate() exists])
+       ],[
+               AC_MSG_RESULT(no)
+       ])
+])
+
+dnl #
+dnl # Linux 2.6.x - 2.6.37 API
+dnl #
+AC_DEFUN([SPL_AC_KERNEL_INODE_FALLOCATE], [
+       AC_MSG_CHECKING([whether iops->fallocate() exists])
+       SPL_LINUX_TRY_COMPILE([
+               #include <linux/fs.h>
+       ],[
+               long (*fallocate) (struct inode *, int, loff_t, loff_t) = NULL;
+               struct inode_operations fops __attribute__ ((unused)) = {
+                       .fallocate = fallocate,
+               };
+       ],[
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_INODE_FALLOCATE, 1, [fops->fallocate() exists])
+       ],[
+               AC_MSG_RESULT(no)
+       ])
+])
+
+dnl #
+dnl # PaX Linux 2.6.38 - 3.x API
+dnl #
+AC_DEFUN([SPL_AC_PAX_KERNEL_FILE_FALLOCATE], [
+       AC_MSG_CHECKING([whether fops->fallocate() exists])
+       SPL_LINUX_TRY_COMPILE([
+               #include <linux/fs.h>
+       ],[
+               long (*fallocate) (struct file *, int, loff_t, loff_t) = NULL;
+               struct file_operations_no_const fops __attribute__ ((unused)) = {
+                       .fallocate = fallocate,
+               };
+       ],[
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_FILE_FALLOCATE, 1, [fops->fallocate() exists])
+       ],[
+               AC_MSG_RESULT(no)
+       ])
+])
+
+dnl #
+dnl # The fallocate callback was moved from the inode_operations
+dnl # structure to the file_operations structure.
+dnl #
+AC_DEFUN([SPL_AC_KERNEL_FALLOCATE], [
+       SPL_AC_KERNEL_FILE_FALLOCATE
+       SPL_AC_KERNEL_INODE_FALLOCATE
+       SPL_AC_PAX_KERNEL_FILE_FALLOCATE
+])
+
+dnl #
+dnl # 2.6.33 API change. Also backported in RHEL5 as of 2.6.18-190.el5.
+dnl # Earlier versions of rwsem_is_locked() were inline and had a race
+dnl # condition.  The fixed version is exported as a symbol.  The race
+dnl # condition is fixed by acquiring sem->wait_lock, so we must not
+dnl # call that version while holding sem->wait_lock.
+dnl #
+AC_DEFUN([SPL_AC_EXPORTED_RWSEM_IS_LOCKED],
+       [AC_MSG_CHECKING([whether rwsem_is_locked() acquires sem->wait_lock])
+       SPL_LINUX_TRY_COMPILE_SYMBOL([
+               #include <linux/rwsem.h>
+               int rwsem_is_locked(struct rw_semaphore *sem) { return 0; }
+       ], [], [rwsem_is_locked], [lib/rwsem-spinlock.c], [
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(RWSEM_IS_LOCKED_TAKES_WAIT_LOCK, 1,
+                         [rwsem_is_locked() acquires sem->wait_lock])
+       ], [
+               AC_MSG_RESULT(no)
+       ])
+])
+
+dnl #
+dnl # 2.6.xx API compat,
+dnl # There currently exists no exposed API to partially shrink the dcache.
+dnl # The expected mechanism to shrink the cache is a registered shrinker
+dnl # which is called during memory pressure.
+dnl #
+AC_DEFUN([SPL_AC_SHRINK_DCACHE_MEMORY],
+       [AC_MSG_CHECKING([whether shrink_dcache_memory() is available])
+       SPL_LINUX_TRY_COMPILE_SYMBOL([
+               #include <linux/dcache.h>
+       ], [
+               shrink_dcache_memory(0, 0);
+       ], [shrink_dcache_memory], [fs/dcache.c], [
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_SHRINK_DCACHE_MEMORY, 1,
+                         [shrink_dcache_memory() is available])
+       ], [
+               AC_MSG_RESULT(no)
+       ])
+])
+
+dnl #
+dnl # 2.6.xx API compat,
+dnl # There currently exists no exposed API to partially shrink the icache.
+dnl # The expected mechanism to shrink the cache is a registered shrinker
+dnl # which is called during memory pressure.
+dnl #
+AC_DEFUN([SPL_AC_SHRINK_ICACHE_MEMORY],
+       [AC_MSG_CHECKING([whether shrink_icache_memory() is available])
+       SPL_LINUX_TRY_COMPILE_SYMBOL([
+               #include <linux/dcache.h>
+       ], [
+               shrink_icache_memory(0, 0);
+       ], [shrink_icache_memory], [fs/inode.c], [
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_SHRINK_ICACHE_MEMORY, 1,
+                         [shrink_icache_memory() is available])
+       ], [
+               AC_MSG_RESULT(no)
+       ])
+])
+
+dnl #
+dnl # 2.6.39 API compat,
+dnl # The path_lookup() function has been renamed to kern_path_parent()
+dnl # and the flags argument has been removed.  The only behavior now
+dnl # offered is that of LOOKUP_PARENT.  The spl already always passed
+dnl # this flag so dropping the flag does not impact us.
+dnl #
+AC_DEFUN([SPL_AC_KERN_PATH_PARENT_HEADER], [
+       SPL_CHECK_SYMBOL_HEADER(
+               [kern_path_parent],
+               [int kern_path_parent(const char \*, struct nameidata \*)],
+               [include/linux/namei.h],
+               [AC_DEFINE(HAVE_KERN_PATH_PARENT_HEADER, 1,
+               [kern_path_parent() is available])],
+               [])
+])
+
+dnl #
+dnl # 3.1 API compat,
+dnl # The kern_path_parent() symbol is no longer exported by the kernel.
+dnl # However, it remains the prefered interface and since we still have
+dnl # access to the prototype we dynamically lookup the required address.
+dnl #
+AC_DEFUN([SPL_AC_KERN_PATH_PARENT_SYMBOL],
+       [AC_MSG_CHECKING([whether kern_path_parent() is available])
+       SPL_LINUX_TRY_COMPILE_SYMBOL([
+               #include <linux/namei.h>
+       ], [
+               kern_path_parent(NULL, NULL);
+       ], [kern_path_parent], [fs/namei.c], [
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_KERN_PATH_PARENT_SYMBOL, 1,
+                         [kern_path_parent() is available])
+       ], [
+               AC_MSG_RESULT(no)
+       ])
+])
+
+dnl #
+dnl # 3.6 API compat,
+dnl # The kern_path_parent() function was replaced by the kern_path_locked()
+dnl # function to eliminate all struct nameidata usage outside fs/namei.c.
+dnl #
+AC_DEFUN([SPL_AC_KERN_PATH_LOCKED], [
+       SPL_CHECK_SYMBOL_HEADER(
+               [kern_path_locked],
+               [struct dentry \*kern_path_locked(const char \*, struct path \*)],
+               [include/linux/namei.h],
+               [AC_DEFINE(HAVE_KERN_PATH_LOCKED, 1,
+               [kern_path_locked() is available])],
+               [])
+])
+
+dnl #
+dnl # /proc/kallsyms support,
+dnl # Verify the kernel has CONFIG_KALLSYMS support enabled.
+dnl #
+AC_DEFUN([SPL_AC_CONFIG_KALLSYMS], [
+       AC_MSG_CHECKING([whether CONFIG_KALLSYMS is defined])
+       SPL_LINUX_TRY_COMPILE([
+               #if !defined(CONFIG_KALLSYMS)
+               #error CONFIG_KALLSYMS not defined
+               #endif
+       ],[ ],[
+               AC_MSG_RESULT([yes])
+       ],[
+               AC_MSG_RESULT([no])
+               AC_MSG_ERROR([
+       *** This kernel does not include the required kallsyms support.
+       *** Rebuild the kernel with CONFIG_KALLSYMS=y set.])
+       ])
+])
+
+dnl #
+dnl # zlib inflate compat,
+dnl # Verify the kernel has CONFIG_ZLIB_INFLATE support enabled.
+dnl #
+AC_DEFUN([SPL_AC_CONFIG_ZLIB_INFLATE], [
+       AC_MSG_CHECKING([whether CONFIG_ZLIB_INFLATE is defined])
+       SPL_LINUX_TRY_COMPILE([
+               #if !defined(CONFIG_ZLIB_INFLATE) && \
+                   !defined(CONFIG_ZLIB_INFLATE_MODULE)
+               #error CONFIG_ZLIB_INFLATE not defined
+               #endif
+       ],[ ],[
+               AC_MSG_RESULT([yes])
+       ],[
+               AC_MSG_RESULT([no])
+               AC_MSG_ERROR([
+       *** This kernel does not include the required zlib inflate support.
+       *** Rebuild the kernel with CONFIG_ZLIB_INFLATE=y|m set.])
+       ])
+])
+
+dnl #
+dnl # zlib deflate compat,
+dnl # Verify the kernel has CONFIG_ZLIB_DEFLATE support enabled.
+dnl #
+AC_DEFUN([SPL_AC_CONFIG_ZLIB_DEFLATE], [
+       AC_MSG_CHECKING([whether CONFIG_ZLIB_DEFLATE is defined])
+       SPL_LINUX_TRY_COMPILE([
+               #if !defined(CONFIG_ZLIB_DEFLATE) && \
+                   !defined(CONFIG_ZLIB_DEFLATE_MODULE)
+               #error CONFIG_ZLIB_DEFLATE not defined
+               #endif
+       ],[ ],[
+               AC_MSG_RESULT([yes])
+       ],[
+               AC_MSG_RESULT([no])
+               AC_MSG_ERROR([
+       *** This kernel does not include the required zlib deflate support.
+       *** Rebuild the kernel with CONFIG_ZLIB_DEFLATE=y|m set.])
+       ])
+])
+
+dnl #
+dnl # 2.6.39 API compat,
+dnl # The function zlib_deflate_workspacesize() now take 2 arguments.
+dnl # This was done to avoid always having to allocate the maximum size
+dnl # workspace (268K).  The caller can now specific the windowBits and
+dnl # memLevel compression parameters to get a smaller workspace.
+dnl #
+AC_DEFUN([SPL_AC_2ARGS_ZLIB_DEFLATE_WORKSPACESIZE],
+       [AC_MSG_CHECKING([whether zlib_deflate_workspacesize() wants 2 args])
+       SPL_LINUX_TRY_COMPILE([
+               #include <linux/zlib.h>
+       ],[
+               return zlib_deflate_workspacesize(MAX_WBITS, MAX_MEM_LEVEL);
+       ],[
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_2ARGS_ZLIB_DEFLATE_WORKSPACESIZE, 1,
+                         [zlib_deflate_workspacesize() wants 2 args])
+       ],[
+               AC_MSG_RESULT(no)
+       ])
+])
+
+dnl #
+dnl # 2.6.39 API change,
+dnl # Shrinker adjust to use common shrink_control structure.
+dnl #
+AC_DEFUN([SPL_AC_SHRINK_CONTROL_STRUCT], [
+       AC_MSG_CHECKING([whether struct shrink_control exists])
+       SPL_LINUX_TRY_COMPILE([
+               #include <linux/mm.h>
+       ],[
+               struct shrink_control sc __attribute__ ((unused));
+
+               sc.nr_to_scan = 0;
+               sc.gfp_mask = GFP_KERNEL;
+       ],[
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_SHRINK_CONTROL_STRUCT, 1,
+                       [struct shrink_control exists])
+       ],[
+               AC_MSG_RESULT(no)
+       ])
+])
+
+dnl #
+dnl # 3.1 API Change
+dnl #
+dnl # The rw_semaphore.wait_lock member was changed from spinlock_t to
+dnl # raw_spinlock_t at commit ddb6c9b58a19edcfac93ac670b066c836ff729f1.
+dnl #
+AC_DEFUN([SPL_AC_RWSEM_SPINLOCK_IS_RAW], [
+       AC_MSG_CHECKING([whether struct rw_semaphore member wait_lock is raw])
+       tmp_flags="$EXTRA_KCFLAGS"
+       EXTRA_KCFLAGS="-Werror"
+       SPL_LINUX_TRY_COMPILE([
+               #include <linux/rwsem.h>
+       ],[
+               struct rw_semaphore dummy_semaphore __attribute__ ((unused));
+               raw_spinlock_t dummy_lock __attribute__ ((unused));
+               dummy_semaphore.wait_lock = dummy_lock;
+       ],[
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(RWSEM_SPINLOCK_IS_RAW, 1,
+               [struct rw_semaphore member wait_lock is raw_spinlock_t])
+       ],[
+               AC_MSG_RESULT(no)
+       ])
+       EXTRA_KCFLAGS="$tmp_flags"
+])
+
+dnl #
+dnl # 3.9 API change,
+dnl # Moved things from linux/sched.h to linux/sched/rt.h
+dnl #
+AC_DEFUN([SPL_AC_SCHED_RT_HEADER],
+       [AC_MSG_CHECKING([whether header linux/sched/rt.h exists])
+       SPL_LINUX_TRY_COMPILE([
+               #include <linux/sched.h>
+               #include <linux/sched/rt.h>
+       ],[
+               return 0;
+       ],[
+               AC_DEFINE(HAVE_SCHED_RT_HEADER, 1, [linux/sched/rt.h exists])
+               AC_MSG_RESULT(yes)
+       ],[
+               AC_MSG_RESULT(no)
+       ])
+])
+
+dnl #
+dnl # 3.9 API change,
+dnl # vfs_getattr() uses 2 args
+dnl # It takes struct path * instead of struct vfsmount * and struct dentry *
+dnl #
+AC_DEFUN([SPL_AC_2ARGS_VFS_GETATTR], [
+       AC_MSG_CHECKING([whether vfs_getattr() wants])
+       SPL_LINUX_TRY_COMPILE([
+               #include <linux/fs.h>
+       ],[
+               vfs_getattr((struct path *) NULL,
+                       (struct kstat *)NULL);
+       ],[
+               AC_MSG_RESULT(2 args)
+               AC_DEFINE(HAVE_2ARGS_VFS_GETATTR, 1,
+                         [vfs_getattr wants 2 args])
+       ],[
+               SPL_LINUX_TRY_COMPILE([
+                       #include <linux/fs.h>
+               ],[
+                       vfs_getattr((struct vfsmount *)NULL,
+                               (struct dentry *)NULL,
+                               (struct kstat *)NULL);
+               ],[
+                       AC_MSG_RESULT(3 args)
+               ],[
+                       AC_MSG_ERROR(unknown)
+               ])
+       ])
+])