LU-12400 llite: Use the new vm_fault_t type

[fs/lustre-release.git] / lustre / autoconf / lustre-core.m4

diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4
index 2242af4..635563f 100644 (file)
--- a/lustre/autoconf/lustre-core.m4
+++ b/lustre/autoconf/lustre-core.m4
@@ -2660,8 +2660,8 @@ direct_io_2args, [
 #
 # LC_GENERIC_WRITE_SYNC_2ARGS
 #
-# Kernel version 4.7 commit c8b8e32d700fe943a935e435ae251364d016c497
-# direct-io: eliminate the offset argument to ->direct_IO
+# Kernel version 4.7 commit dde0c2e79848298cc25621ad080d47f94dbd7cce
+# fs: add IOCB_SYNC and IOCB_DSYNC
 #
 AC_DEFUN([LC_GENERIC_WRITE_SYNC_2ARGS], [
 LB_CHECK_COMPILE([if 'generic_write_sync()' taken 2 arguments],
@@ -3157,6 +3157,25 @@ i_pages, [
 ]) # LC_I_PAGES
 
 #
+# LC_VM_FAULT_T
+#
+# kernel 4.17 commit 3d3539018d2cbd12e5af4a132636ee7fd8d43ef0
+# mm: create the new vm_fault_t type
+#
+AC_DEFUN([LC_VM_FAULT_T], [
+LB_CHECK_COMPILE([if vm_fault_t type exists],
+vm_fault_t, [
+       #include <linux/mm_types.h>
+],[
+       vm_fault_t x = VM_FAULT_SIGBUS;
+       (void)x
+],[
+       AC_DEFINE(HAVE_VM_FAULT_T, 1,
+               [if vm_fault_t type exists])
+])
+]) # LC_VM_FAULT_T
+
+#
 # LC_INODE_TIMESPEC64
 #
 # kernel 4.17-rc7 commit 8efd6894ff089adeeac7cb9f32125b85d963d1bc
@@ -3440,6 +3459,7 @@ AC_DEFUN([LC_PROG_LINUX], [
        LC_BI_BDEV
 
        # 4.17
+       LC_VM_FAULT_T
        LC_I_PAGES
 
        # 4.18
@@ -3766,13 +3786,6 @@ lustre/kernel_patches/targets/3.10-rhel7.6.target
 lustre/kernel_patches/targets/3.10-rhel7.5.target
 lustre/kernel_patches/targets/4.14-rhel7.5.target
 lustre/kernel_patches/targets/4.14-rhel7.6.target
-lustre/kernel_patches/targets/2.6-rhel6.9.target
-lustre/kernel_patches/targets/2.6-rhel6.8.target
-lustre/kernel_patches/targets/2.6-rhel6.7.target
-lustre/kernel_patches/targets/2.6-rhel6.6.target
-lustre/kernel_patches/targets/2.6-rhel6.target
-lustre/kernel_patches/targets/2.6-rhel5.target
-lustre/kernel_patches/targets/2.6-sles11.target
 lustre/kernel_patches/targets/3.0-sles11.target
 lustre/kernel_patches/targets/3.0-sles11sp3.target
 lustre/kernel_patches/targets/3.0-sles11sp4.target
@@ -3780,9 +3793,6 @@ lustre/kernel_patches/targets/3.12-sles12.target
 lustre/kernel_patches/targets/4.4-sles12.target
 lustre/kernel_patches/targets/4.4-sles12sp3.target
 lustre/kernel_patches/targets/4.12-sles12sp4.target
-lustre/kernel_patches/targets/2.6-fc11.target
-lustre/kernel_patches/targets/2.6-fc12.target
-lustre/kernel_patches/targets/2.6-fc15.target
 lustre/kernel_patches/targets/3.x-fc18.target
 lustre/ldlm/Makefile
 lustre/fid/Makefile