[Pvfs2-cvs] commit by slang in pvfs2: configure pvfs2-config.h.in

CVS commit program cvs at parl.clemson.edu
Sat Nov 3 20:38:56 EST 2007


Update of /projects/cvsroot/pvfs2
In directory parlweb1:/tmp/cvs-serv16625

Modified Files:
	configure pvfs2-config.h.in 
Log Message:
fix kmod compile with kernels earlier than 2.6.23


Index: configure
===================================================================
RCS file: /projects/cvsroot/pvfs2/configure,v
diff -p -u -r1.363 -r1.364
--- configure	18 Oct 2007 15:55:33 -0000	1.363
+++ configure	4 Nov 2007 01:38:54 -0000	1.364
@@ -11323,6 +11323,63 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
+		{ echo "$as_me:$LINENO: checking for destructor param to kmem_cache_create" >&5
+echo $ECHO_N "checking for destructor param to kmem_cache_create... $ECHO_C" >&6; }
+	cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+	    #define __KERNEL__
+	    #include <linux/slab.h>
+
+int
+main ()
+{
+
+	   kmem_cache_create("config-test", 0, 0, 0, NULL, NULL);
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_KMEM_CACHE_CREATE_DESTRUCTOR_PARAM 1
+_ACEOF
+
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	{ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
 	CFLAGS=$oldcflags
 
 
@@ -16332,7 +16389,7 @@ if test "$ac_res" != no; then
   ac_cv_func_getmntent=yes
 
 cat >>confdefs.h <<\_ACEOF
-#define HAVE_GETMNTENT
+#define HAVE_GETMNTENT 1
 _ACEOF
 
 else

Index: pvfs2-config.h.in
===================================================================
RCS file: /projects/cvsroot/pvfs2/pvfs2-config.h.in,v
diff -p -u -r1.109 -r1.110
--- pvfs2-config.h.in	31 Oct 2007 22:55:37 -0000	1.109
+++ pvfs2-config.h.in	4 Nov 2007 01:38:56 -0000	1.110
@@ -58,9 +58,6 @@
 /* Define if statfs callback has struct dentry argument */
 #undef HAVE_DENTRY_STATFS_SOP
 
-/* Define if kernel (2.6.22 or older) has kmem_cache_create with eight args */
-#undef HAVE_EIGHT_ARG_KMEM_CACHE_CREATE
-
 /* Define to 1 if you have the <execinfo.h> header file. */
 #undef HAVE_EXECINFO_H
 
@@ -161,6 +158,9 @@
 
 /* Define if kernel lacks device classes */
 #undef HAVE_KERNEL_DEVICE_CLASSES
+
+/* Define if kernel kmem_cache_create has destructor param */
+#undef HAVE_KMEM_CACHE_CREATE_DESTRUCTOR_PARAM
 
 /* Define if kmem_cache_destroy returns int */
 #undef HAVE_KMEM_CACHE_DESTROY_INT_RETURN



More information about the Pvfs2-cvs mailing list