[Pkg-ofed-commits] r451 - in /branches/sid-uploads: mstflint/branches/upstream/c...
opensides-guest at alioth.debian.org
opensides-guest at alioth.debian.org
Wed Aug 12 22:09:11 UTC 2009
Author: opensides-guest
Date: Wed Aug 12 22:09:11 2009
New Revision: 451
URL: http://svn.debian.org/wsvn/pkg-ofed/?sc=1&rev=451
Log:
- putting ofa-kernel sid-upload up to 1.4.2
Modified:
branches/sid-uploads/mstflint/branches/upstream/current/autom4te.cache/output.0
branches/sid-uploads/mstflint/branches/upstream/current/autom4te.cache/output.1
branches/sid-uploads/mstflint/branches/upstream/current/autom4te.cache/traces.1
branches/sid-uploads/ofa-kernel/trunk/drivers/infiniband/ulp/sdp/sdp.h
branches/sid-uploads/ofa-kernel/trunk/drivers/infiniband/ulp/sdp/sdp_bcopy.c
branches/sid-uploads/ofa-kernel/trunk/drivers/infiniband/ulp/sdp/sdp_cma.c
branches/sid-uploads/ofa-kernel/trunk/drivers/infiniband/ulp/sdp/sdp_main.c
branches/sid-uploads/ofa-kernel/trunk/drivers/net/mlx4/en_lro.c
branches/sid-uploads/ofa-kernel/trunk/kernel_addons/backport/2.6.16_sles10_sp2/include/linux/mm.h
branches/sid-uploads/ofa-kernel/trunk/kernel_addons/backport/2.6.18-EL5.2/include/linux/fs.h
branches/sid-uploads/ofa-kernel/trunk/kernel_addons/backport/2.6.18-EL5.3/include/linux/fs.h
branches/sid-uploads/ofa-kernel/trunk/kernel_addons/backport/2.6.18-EL5.3/include/linux/mpage.h
branches/sid-uploads/ofa-kernel/trunk/kernel_addons/backport/2.6.9_U4/include/linux/spinlock.h
branches/sid-uploads/ofa-kernel/trunk/kernel_addons/backport/2.6.9_U5/include/linux/spinlock.h
branches/sid-uploads/ofa-kernel/trunk/kernel_addons/backport/2.6.9_U6/include/linux/spinlock.h
branches/sid-uploads/ofa-kernel/trunk/kernel_addons/backport/2.6.9_U7/include/linux/spinlock.h
branches/sid-uploads/ofa-kernel/trunk/net/rds/connection.c
branches/sid-uploads/ofa-kernel/trunk/net/rds/ib.c
branches/sid-uploads/ofa-kernel/trunk/net/rds/ib.h
branches/sid-uploads/ofa-kernel/trunk/net/rds/ib_rdma.c
branches/sid-uploads/ofa-kernel/trunk/net/rds/iw.c
branches/sid-uploads/ofa-kernel/trunk/net/rds/iw.h
branches/sid-uploads/ofa-kernel/trunk/net/rds/iw_rdma.c
branches/sid-uploads/ofa-kernel/trunk/net/rds/iw_send.c
branches/sid-uploads/ofa-kernel/trunk/net/rds/recv.c
Modified: branches/sid-uploads/mstflint/branches/upstream/current/autom4te.cache/output.0
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/sid-uploads/mstflint/branches/upstream/current/autom4te.cache/output.0?rev=451&op=diff
==============================================================================
--- branches/sid-uploads/mstflint/branches/upstream/current/autom4te.cache/output.0 (original)
+++ branches/sid-uploads/mstflint/branches/upstream/current/autom4te.cache/output.0 Wed Aug 12 22:09:11 2009
@@ -465,7 +465,7 @@
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS PROJECT VERSION INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIB@&t at OBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS PROJECT VERSION INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL mstflint_LIBS mstflint_CXXFLAGS LIB@&t at OBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -1036,6 +1036,7 @@
--enable-fast-install@<:@=PKGS@:>@
optimize for fast installation @<:@default=yes@:>@
--disable-libtool-lock avoid locking (might break parallel builds)
+ --disable-dc Disable mstflint "dc" command. Eliminate zlib dependency
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@@ -18594,6 +18595,247 @@
ac_config_headers="$ac_config_headers config.h"
+echo "$as_me:$LINENO: checking --enable-dc argument" >&5
+echo $ECHO_N "checking --enable-dc argument... $ECHO_C" >&6
+# Check whether --enable-dc or --disable-dc was given.
+if test "${enable_dc+set}" = set; then
+ enableval="$enable_dc"
+ enable_dc=$enableval
+else
+ enable_dc="yes"
+fi;
+echo "$as_me:$LINENO: result: $enableval" >&5
+echo "${ECHO_T}$enableval" >&6
+if test "$enable_dc" = "yes"; then
+ if test "${ac_cv_header_zlib_h+set}" = set; then
+ echo "$as_me:$LINENO: checking for zlib.h" >&5
+echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6
+if test "${ac_cv_header_zlib_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
+echo "${ECHO_T}$ac_cv_header_zlib_h" >&6
+else
+ # Is the header compilable?
+echo "$as_me:$LINENO: checking zlib.h usability" >&5
+echo $ECHO_N "checking zlib.h usability... $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. */
+$ac_includes_default
+@%:@include <zlib.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_header_compiler=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking zlib.h presence" >&5
+echo $ECHO_N "checking zlib.h presence... $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. */
+@%:@include <zlib.h>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+ ac_header_preproc=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: zlib.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: zlib.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: zlib.h: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: zlib.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: zlib.h: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: zlib.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: zlib.h: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: zlib.h: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: zlib.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: zlib.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: zlib.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: zlib.h: in the future, the compiler will take precedence" >&2;}
+ (
+ cat <<\_ASBOX
+@%:@@%:@ ----------------------------------- @%:@@%:@
+@%:@@%:@ Report this to orenk at mellanox.co.il @%:@@%:@
+@%:@@%:@ ----------------------------------- @%:@@%:@
+_ASBOX
+ ) |
+ sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+echo "$as_me:$LINENO: checking for zlib.h" >&5
+echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6
+if test "${ac_cv_header_zlib_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_cv_header_zlib_h=$ac_header_preproc
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
+echo "${ECHO_T}$ac_cv_header_zlib_h" >&6
+
+fi
+if test $ac_cv_header_zlib_h = yes; then
+ :
+else
+ { { echo "$as_me:$LINENO: error: cannot find zlib.h . Use --disable-dc to remove this dependaency" >&5
+echo "$as_me: error: cannot find zlib.h . Use --disable-dc to remove this dependaency" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+
+
+echo "$as_me:$LINENO: checking for uncompress in -lz" >&5
+echo $ECHO_N "checking for uncompress in -lz... $ECHO_C" >&6
+if test "${ac_cv_lib_z_uncompress+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lz $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char uncompress ();
+int
+main ()
+{
+uncompress ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 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); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_z_uncompress=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_z_uncompress=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_z_uncompress" >&5
+echo "${ECHO_T}$ac_cv_lib_z_uncompress" >&6
+if test $ac_cv_lib_z_uncompress = yes; then
+ cat >>confdefs.h <<_ACEOF
+@%:@define HAVE_LIBZ 1
+_ACEOF
+
+ LIBS="-lz $LIBS"
+
+else
+ { { echo "$as_me:$LINENO: error: cannot find zlib uncompress() function. Use --disable-dc to remove this dependaency" >&5
+echo "$as_me: error: cannot find zlib uncompress() function. Use --disable-dc to remove this dependaency" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+ mstflint_LIBS="-lz"
+else
+ mstflint_CXXFLAGS="-DNO_ZLIB"
+fi
+
+
+
ac_config_files="$ac_config_files Makefile mstflint.spec"
cat >confcache <<\_ACEOF
@@ -19307,6 +19549,8 @@
s, at FFLAGS@,$FFLAGS,;t t
s, at ac_ct_F77@,$ac_ct_F77,;t t
s, at LIBTOOL@,$LIBTOOL,;t t
+s, at mstflint_LIBS@,$mstflint_LIBS,;t t
+s, at mstflint_CXXFLAGS@,$mstflint_CXXFLAGS,;t t
s, at LIB@&t at OBJS@,$LIB@&t at OBJS,;t t
s, at LTLIBOBJS@,$LTLIBOBJS,;t t
CEOF
Modified: branches/sid-uploads/mstflint/branches/upstream/current/autom4te.cache/output.1
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/sid-uploads/mstflint/branches/upstream/current/autom4te.cache/output.1?rev=451&op=diff
==============================================================================
--- branches/sid-uploads/mstflint/branches/upstream/current/autom4te.cache/output.1 (original)
+++ branches/sid-uploads/mstflint/branches/upstream/current/autom4te.cache/output.1 Wed Aug 12 22:09:11 2009
@@ -465,7 +465,7 @@
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS PROJECT VERSION INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIB@&t at OBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS PROJECT VERSION INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL mstflint_LIBS mstflint_CXXFLAGS LIB@&t at OBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -1036,6 +1036,7 @@
--enable-fast-install@<:@=PKGS@:>@
optimize for fast installation @<:@default=yes@:>@
--disable-libtool-lock avoid locking (might break parallel builds)
+ --disable-dc Disable mstflint "dc" command. Eliminate zlib dependency
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@@ -18582,6 +18583,247 @@
ac_config_headers="$ac_config_headers config.h"
+echo "$as_me:$LINENO: checking --enable-dc argument" >&5
+echo $ECHO_N "checking --enable-dc argument... $ECHO_C" >&6
+# Check whether --enable-dc or --disable-dc was given.
+if test "${enable_dc+set}" = set; then
+ enableval="$enable_dc"
+ enable_dc=$enableval
+else
+ enable_dc="yes"
+fi;
+echo "$as_me:$LINENO: result: $enableval" >&5
+echo "${ECHO_T}$enableval" >&6
+if test "$enable_dc" = "yes"; then
+ if test "${ac_cv_header_zlib_h+set}" = set; then
+ echo "$as_me:$LINENO: checking for zlib.h" >&5
+echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6
+if test "${ac_cv_header_zlib_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
+echo "${ECHO_T}$ac_cv_header_zlib_h" >&6
+else
+ # Is the header compilable?
+echo "$as_me:$LINENO: checking zlib.h usability" >&5
+echo $ECHO_N "checking zlib.h usability... $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. */
+$ac_includes_default
+@%:@include <zlib.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_header_compiler=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking zlib.h presence" >&5
+echo $ECHO_N "checking zlib.h presence... $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. */
+@%:@include <zlib.h>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+ ac_header_preproc=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: zlib.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: zlib.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: zlib.h: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: zlib.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: zlib.h: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: zlib.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: zlib.h: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: zlib.h: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: zlib.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: zlib.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: zlib.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: zlib.h: in the future, the compiler will take precedence" >&2;}
+ (
+ cat <<\_ASBOX
+@%:@@%:@ ----------------------------------- @%:@@%:@
+@%:@@%:@ Report this to orenk at mellanox.co.il @%:@@%:@
+@%:@@%:@ ----------------------------------- @%:@@%:@
+_ASBOX
+ ) |
+ sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+echo "$as_me:$LINENO: checking for zlib.h" >&5
+echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6
+if test "${ac_cv_header_zlib_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_cv_header_zlib_h=$ac_header_preproc
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
+echo "${ECHO_T}$ac_cv_header_zlib_h" >&6
+
+fi
+if test $ac_cv_header_zlib_h = yes; then
+ :
+else
+ { { echo "$as_me:$LINENO: error: cannot find zlib.h . Use --disable-dc to remove this dependaency" >&5
+echo "$as_me: error: cannot find zlib.h . Use --disable-dc to remove this dependaency" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+
+
+echo "$as_me:$LINENO: checking for uncompress in -lz" >&5
+echo $ECHO_N "checking for uncompress in -lz... $ECHO_C" >&6
+if test "${ac_cv_lib_z_uncompress+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lz $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char uncompress ();
+int
+main ()
+{
+uncompress ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 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); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_z_uncompress=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_z_uncompress=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_z_uncompress" >&5
+echo "${ECHO_T}$ac_cv_lib_z_uncompress" >&6
+if test $ac_cv_lib_z_uncompress = yes; then
+ cat >>confdefs.h <<_ACEOF
+@%:@define HAVE_LIBZ 1
+_ACEOF
+
+ LIBS="-lz $LIBS"
+
+else
+ { { echo "$as_me:$LINENO: error: cannot find zlib uncompress() function. Use --disable-dc to remove this dependaency" >&5
+echo "$as_me: error: cannot find zlib uncompress() function. Use --disable-dc to remove this dependaency" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+ mstflint_LIBS="-lz"
+else
+ mstflint_CXXFLAGS="-DNO_ZLIB"
+fi
+
+
+
ac_config_files="$ac_config_files Makefile mstflint.spec"
cat >confcache <<\_ACEOF
@@ -19295,6 +19537,8 @@
s, at FFLAGS@,$FFLAGS,;t t
s, at ac_ct_F77@,$ac_ct_F77,;t t
s, at LIBTOOL@,$LIBTOOL,;t t
+s, at mstflint_LIBS@,$mstflint_LIBS,;t t
+s, at mstflint_CXXFLAGS@,$mstflint_CXXFLAGS,;t t
s, at LIB@&t at OBJS@,$LIB@&t at OBJS,;t t
s, at LTLIBOBJS@,$LTLIBOBJS,;t t
CEOF
Modified: branches/sid-uploads/mstflint/branches/upstream/current/autom4te.cache/traces.1
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/sid-uploads/mstflint/branches/upstream/current/autom4te.cache/traces.1?rev=451&op=diff
==============================================================================
--- branches/sid-uploads/mstflint/branches/upstream/current/autom4te.cache/traces.1 (original)
+++ branches/sid-uploads/mstflint/branches/upstream/current/autom4te.cache/traces.1 Wed Aug 12 22:09:11 2009
@@ -391,6 +391,14 @@
configure.in:18: the top level])
m4trace:configure.in:18: -1- AC_SUBST([LIBTOOL])
m4trace:configure.in:19: -1- AC_CONFIG_HEADERS([config.h ])
-m4trace:configure.in:21: -1- AC_CONFIG_FILES([Makefile mstflint.spec])
-m4trace:configure.in:22: -1- AC_SUBST([LIB@&t at OBJS], [$ac_libobjs])
-m4trace:configure.in:22: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
+m4trace:configure.in:29: -1- AC_CHECK_LIB([z], [uncompress], [], [{ { echo "$as_me:$LINENO: error: cannot find zlib uncompress() function. Use --disable-dc to remove this dependaency" >&5
+echo "$as_me: error: cannot find zlib uncompress() function. Use --disable-dc to remove this dependaency" >&2;}
+ { (exit 1); exit 1; }; }])
+m4trace:configure.in:29: -1- AH_OUTPUT([HAVE_LIBZ], [/* Define to 1 if you have the `z\' library (-lz). */
+#undef HAVE_LIBZ])
+m4trace:configure.in:29: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBZ])
+m4trace:configure.in:34: -1- AC_SUBST([mstflint_LIBS])
+m4trace:configure.in:35: -1- AC_SUBST([mstflint_CXXFLAGS])
+m4trace:configure.in:37: -1- AC_CONFIG_FILES([Makefile mstflint.spec])
+m4trace:configure.in:38: -1- AC_SUBST([LIB@&t at OBJS], [$ac_libobjs])
+m4trace:configure.in:38: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
Modified: branches/sid-uploads/ofa-kernel/trunk/drivers/infiniband/ulp/sdp/sdp.h
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/sid-uploads/ofa-kernel/trunk/drivers/infiniband/ulp/sdp/sdp.h?rev=451&op=diff
==============================================================================
--- branches/sid-uploads/ofa-kernel/trunk/drivers/infiniband/ulp/sdp/sdp.h (original)
+++ branches/sid-uploads/ofa-kernel/trunk/drivers/infiniband/ulp/sdp/sdp.h Wed Aug 12 22:09:11 2009
@@ -334,7 +334,6 @@
void sdp_reset_sk(struct sock *sk, int rc);
void sdp_completion_handler(struct ib_cq *cq, void *cq_context);
void sdp_work(struct work_struct *work);
-int sdp_post_credits(struct sdp_sock *ssk);
void sdp_post_send(struct sdp_sock *ssk, struct sk_buff *skb, u8 mid);
void sdp_post_recvs(struct sdp_sock *ssk);
int sdp_poll_cq(struct sdp_sock *ssk, struct ib_cq *cq);
Modified: branches/sid-uploads/ofa-kernel/trunk/drivers/infiniband/ulp/sdp/sdp_bcopy.c
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/sid-uploads/ofa-kernel/trunk/drivers/infiniband/ulp/sdp/sdp_bcopy.c?rev=451&op=diff
==============================================================================
--- branches/sid-uploads/ofa-kernel/trunk/drivers/infiniband/ulp/sdp/sdp_bcopy.c (original)
+++ branches/sid-uploads/ofa-kernel/trunk/drivers/infiniband/ulp/sdp/sdp_bcopy.c Wed Aug 12 22:09:11 2009
@@ -488,21 +488,6 @@
(TCP_SKB_CB(skb)->flags & TCPCB_FLAG_PSH);
}
-int sdp_post_credits(struct sdp_sock *ssk)
-{
- if (likely(ssk->bufs > 1) &&
- likely(ssk->tx_head - ssk->tx_tail < SDP_TX_SIZE)) {
- struct sk_buff *skb;
- skb = sdp_stream_alloc_skb(&ssk->isk.sk,
- sizeof(struct sdp_bsdh),
- GFP_KERNEL);
- if (!skb)
- return -ENOMEM;
- sdp_post_send(ssk, skb, SDP_MID_DATA);
- }
- return 0;
-}
-
void sdp_post_sends(struct sdp_sock *ssk, int nonagle)
{
/* TODO: nonagle? */
@@ -745,6 +730,10 @@
break;
}
skb = sdp_sock_queue_rcv_skb(sk, skb);
+
+ /* skb might have been changed. need to read current header */
+ h = (struct sdp_bsdh *)skb_transport_header(skb);
+
if (unlikely(h->flags & SDP_OOB_PRES))
sdp_urg(ssk, skb);
break;
Modified: branches/sid-uploads/ofa-kernel/trunk/drivers/infiniband/ulp/sdp/sdp_cma.c
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/sid-uploads/ofa-kernel/trunk/drivers/infiniband/ulp/sdp/sdp_cma.c?rev=451&op=diff
==============================================================================
--- branches/sid-uploads/ofa-kernel/trunk/drivers/infiniband/ulp/sdp/sdp_cma.c (original)
+++ branches/sid-uploads/ofa-kernel/trunk/drivers/infiniband/ulp/sdp/sdp_cma.c Wed Aug 12 22:09:11 2009
@@ -412,11 +412,11 @@
sdp_sk(sk)->rx_tail;
memset(&hh, 0, sizeof hh);
hh.bsdh.mid = SDP_MID_HELLO;
- hh.bsdh.bufs = htons(sdp_sk(sk)->remote_credits);
hh.bsdh.len = htonl(sizeof(struct sdp_bsdh) + SDP_HH_SIZE);
hh.max_adverts = 1;
hh.majv_minv = SDP_MAJV_MINV;
sdp_init_buffers(sdp_sk(sk), rcvbuf_initial_size);
+ hh.bsdh.bufs = htons(sdp_sk(sk)->rx_head - sdp_sk(sk)->rx_tail);
hh.localrcvsz = hh.desremrcvsz = htonl(sdp_sk(sk)->recv_frags *
PAGE_SIZE + SDP_HEAD_SIZE);
hh.max_adverts = 0x1;
@@ -446,7 +446,8 @@
sdp_sk(child)->rx_tail;
memset(&hah, 0, sizeof hah);
hah.bsdh.mid = SDP_MID_HELLO_ACK;
- hah.bsdh.bufs = htons(sdp_sk(child)->remote_credits);
+ hah.bsdh.bufs =
+ htons(sdp_sk(child)->rx_head - sdp_sk(child)->rx_tail);
hah.bsdh.len = htonl(sizeof(struct sdp_bsdh) + SDP_HAH_SIZE);
hah.majv_minv = SDP_MAJV_MINV;
hah.ext_max_adverts = 1; /* Doesn't seem to be mandated by spec,
@@ -473,9 +474,6 @@
rdma_reject(id, NULL, 0);
else
rc = rdma_accept(id, NULL);
-
- if (!rc)
- rc = sdp_post_credits(sdp_sk(sk));
break;
case RDMA_CM_EVENT_CONNECT_ERROR:
sdp_dbg(sk, "RDMA_CM_EVENT_CONNECT_ERROR\n");
Modified: branches/sid-uploads/ofa-kernel/trunk/drivers/infiniband/ulp/sdp/sdp_main.c
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/sid-uploads/ofa-kernel/trunk/drivers/infiniband/ulp/sdp/sdp_main.c?rev=451&op=diff
==============================================================================
--- branches/sid-uploads/ofa-kernel/trunk/drivers/infiniband/ulp/sdp/sdp_main.c (original)
+++ branches/sid-uploads/ofa-kernel/trunk/drivers/infiniband/ulp/sdp/sdp_main.c Wed Aug 12 22:09:11 2009
@@ -143,8 +143,6 @@
static DEFINE_RWLOCK(device_removal_lock);
-static inline void sdp_start_dreq_wait_timeout(struct sdp_sock *ssk, int timeo);
-
static inline unsigned int sdp_keepalive_time_when(const struct sdp_sock *ssk)
{
return ssk->keepalive_time ? : sdp_keepalive_time;
@@ -445,6 +443,14 @@
done:
sdp_dbg(sk, "%s done\n", __func__);
+}
+
+static inline void sdp_start_dreq_wait_timeout(struct sdp_sock *ssk, int timeo)
+{
+ sdp_dbg(&ssk->isk.sk, "Starting dreq wait timeout\n");
+
+ queue_delayed_work(sdp_workqueue, &ssk->dreq_wait_work, timeo);
+ ssk->dreq_wait_timeout = 1;
}
static void sdp_send_disconnect(struct sock *sk)
@@ -840,14 +846,6 @@
return put_user(answ, (int __user *)arg);
}
-static inline void sdp_start_dreq_wait_timeout(struct sdp_sock *ssk, int timeo)
-{
- sdp_dbg(&ssk->isk.sk, "Starting dreq wait timeout\n");
-
- queue_delayed_work(sdp_workqueue, &ssk->dreq_wait_work, timeo);
- ssk->dreq_wait_timeout = 1;
-}
-
void sdp_cancel_dreq_wait_timeout(struct sdp_sock *ssk)
{
if (!ssk->dreq_wait_timeout)
@@ -1296,7 +1294,7 @@
}
if (bz->pages) {
- for (i = bz->cur_page; i < bz->page_cnt; i++)
+ for (i = 0; i < bz->cur_page; i++)
put_page(bz->pages[i]);
kfree(bz->pages);
Modified: branches/sid-uploads/ofa-kernel/trunk/drivers/net/mlx4/en_lro.c
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/sid-uploads/ofa-kernel/trunk/drivers/net/mlx4/en_lro.c?rev=451&op=diff
==============================================================================
--- branches/sid-uploads/ofa-kernel/trunk/drivers/net/mlx4/en_lro.c (original)
+++ branches/sid-uploads/ofa-kernel/trunk/drivers/net/mlx4/en_lro.c Wed Aug 12 22:09:11 2009
@@ -355,7 +355,7 @@
if (lro) {
/* Check VLAN tag */
- if (cqe->vlan_my_qpn & MLX4_CQE_VLAN_PRESENT_MASK) {
+ if (be32_to_cpu(cqe->vlan_my_qpn) & MLX4_CQE_VLAN_PRESENT_MASK) {
if (cqe->sl_vid != lro->vlan_prio || !lro->has_vlan) {
mlx4_en_lro_flush_single(priv, ring, lro);
goto sync_device;
@@ -453,7 +453,7 @@
tcp_data_len);
/* Handle vlans */
- if (cqe->vlan_my_qpn & MLX4_CQE_VLAN_PRESENT_MASK) {
+ if (be32_to_cpu(cqe->vlan_my_qpn) & MLX4_CQE_VLAN_PRESENT_MASK) {
lro->vlan_prio = cqe->sl_vid;
lro->has_vlan = 1;
} else
Modified: branches/sid-uploads/ofa-kernel/trunk/kernel_addons/backport/2.6.16_sles10_sp2/include/linux/mm.h
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/sid-uploads/ofa-kernel/trunk/kernel_addons/backport/2.6.16_sles10_sp2/include/linux/mm.h?rev=451&op=diff
==============================================================================
--- branches/sid-uploads/ofa-kernel/trunk/kernel_addons/backport/2.6.16_sles10_sp2/include/linux/mm.h (original)
+++ branches/sid-uploads/ofa-kernel/trunk/kernel_addons/backport/2.6.16_sles10_sp2/include/linux/mm.h Wed Aug 12 22:09:11 2009
@@ -24,7 +24,7 @@
static inline void cancel_dirty_page(struct page *page, unsigned int account_size)
{
- if (TestClearPageDirty(page)) {
+ if (test_clear_page_dirty(page)) {
struct address_space *mapping = page->mapping;
if (mapping && account_size)
task_io_account_cancelled_write(account_size);
Modified: branches/sid-uploads/ofa-kernel/trunk/kernel_addons/backport/2.6.18-EL5.2/include/linux/fs.h
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/sid-uploads/ofa-kernel/trunk/kernel_addons/backport/2.6.18-EL5.2/include/linux/fs.h?rev=451&op=diff
==============================================================================
--- branches/sid-uploads/ofa-kernel/trunk/kernel_addons/backport/2.6.18-EL5.2/include/linux/fs.h (original)
+++ branches/sid-uploads/ofa-kernel/trunk/kernel_addons/backport/2.6.18-EL5.2/include/linux/fs.h Wed Aug 12 22:09:11 2009
@@ -18,7 +18,7 @@
new->fl_start = fl->fl_start;
new->fl_end = fl->fl_end;
new->fl_ops = NULL;
- new->fl_lmops = NULL;
+ new->fl_lmops = fl->fl_lmops;
}
#define vfs_setlease(a, b, c) setlease(a, b, c)
Modified: branches/sid-uploads/ofa-kernel/trunk/kernel_addons/backport/2.6.18-EL5.3/include/linux/fs.h
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/sid-uploads/ofa-kernel/trunk/kernel_addons/backport/2.6.18-EL5.3/include/linux/fs.h?rev=451&op=diff
==============================================================================
--- branches/sid-uploads/ofa-kernel/trunk/kernel_addons/backport/2.6.18-EL5.3/include/linux/fs.h (original)
+++ branches/sid-uploads/ofa-kernel/trunk/kernel_addons/backport/2.6.18-EL5.3/include/linux/fs.h Wed Aug 12 22:09:11 2009
@@ -18,7 +18,7 @@
new->fl_start = fl->fl_start;
new->fl_end = fl->fl_end;
new->fl_ops = NULL;
- new->fl_lmops = NULL;
+ new->fl_lmops = fl->fl_lmops;
}
#define vfs_setlease(a, b, c) setlease(a, b, c)
Modified: branches/sid-uploads/ofa-kernel/trunk/kernel_addons/backport/2.6.18-EL5.3/include/linux/mpage.h
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/sid-uploads/ofa-kernel/trunk/kernel_addons/backport/2.6.18-EL5.3/include/linux/mpage.h?rev=451&op=diff
==============================================================================
--- branches/sid-uploads/ofa-kernel/trunk/kernel_addons/backport/2.6.18-EL5.3/include/linux/mpage.h (original)
+++ branches/sid-uploads/ofa-kernel/trunk/kernel_addons/backport/2.6.18-EL5.3/include/linux/mpage.h Wed Aug 12 22:09:11 2009
@@ -2,14 +2,13 @@
#define BACKPORT_LINUX_MPAGE_H
#include_next <linux/mpage.h>
-#include <linux/pagevec.h>
-typedef int (*backport_writepage_t)(struct page *page, struct writeback_control *wbc,
- void *data);
+static inline int backport_write_cache_pages(struct address_space *mapping,
+ struct writeback_control *wbc, writepage_data_t writepage,
+ void *data)
+{
+ return write_cache_pages(mapping, 0, wbc, writepage, data);
+}
+#define write_cache_pages backport_write_cache_pages
-extern int backport_write_cache_pages(struct address_space *mapping,
- struct writeback_control *wbc, backport_writepage_t writepage,
- void *data);
-
-#define write_cache_pages backport_write_cache_pages
#endif
Modified: branches/sid-uploads/ofa-kernel/trunk/kernel_addons/backport/2.6.9_U4/include/linux/spinlock.h
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/sid-uploads/ofa-kernel/trunk/kernel_addons/backport/2.6.9_U4/include/linux/spinlock.h?rev=451&op=diff
==============================================================================
--- branches/sid-uploads/ofa-kernel/trunk/kernel_addons/backport/2.6.9_U4/include/linux/spinlock.h (original)
+++ branches/sid-uploads/ofa-kernel/trunk/kernel_addons/backport/2.6.9_U4/include/linux/spinlock.h Wed Aug 12 22:09:11 2009
@@ -6,6 +6,4 @@
#define spin_lock_nested(lock, subclass) spin_lock(lock)
-#define assert_spin_locked(lock) do { (void)(lock); } while(0)
-
#endif
Modified: branches/sid-uploads/ofa-kernel/trunk/kernel_addons/backport/2.6.9_U5/include/linux/spinlock.h
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/sid-uploads/ofa-kernel/trunk/kernel_addons/backport/2.6.9_U5/include/linux/spinlock.h?rev=451&op=diff
==============================================================================
--- branches/sid-uploads/ofa-kernel/trunk/kernel_addons/backport/2.6.9_U5/include/linux/spinlock.h (original)
+++ branches/sid-uploads/ofa-kernel/trunk/kernel_addons/backport/2.6.9_U5/include/linux/spinlock.h Wed Aug 12 22:09:11 2009
@@ -6,6 +6,4 @@
#define spin_lock_nested(lock, subclass) spin_lock(lock)
-#define assert_spin_locked(lock) do { (void)(lock); } while(0)
-
#endif
Modified: branches/sid-uploads/ofa-kernel/trunk/kernel_addons/backport/2.6.9_U6/include/linux/spinlock.h
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/sid-uploads/ofa-kernel/trunk/kernel_addons/backport/2.6.9_U6/include/linux/spinlock.h?rev=451&op=diff
==============================================================================
--- branches/sid-uploads/ofa-kernel/trunk/kernel_addons/backport/2.6.9_U6/include/linux/spinlock.h (original)
+++ branches/sid-uploads/ofa-kernel/trunk/kernel_addons/backport/2.6.9_U6/include/linux/spinlock.h Wed Aug 12 22:09:11 2009
@@ -5,6 +5,4 @@
#define spin_lock_nested(lock, subclass) spin_lock(lock)
-#define assert_spin_locked(lock) do { (void)(lock); } while(0)
-
#endif
Modified: branches/sid-uploads/ofa-kernel/trunk/kernel_addons/backport/2.6.9_U7/include/linux/spinlock.h
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/sid-uploads/ofa-kernel/trunk/kernel_addons/backport/2.6.9_U7/include/linux/spinlock.h?rev=451&op=diff
==============================================================================
--- branches/sid-uploads/ofa-kernel/trunk/kernel_addons/backport/2.6.9_U7/include/linux/spinlock.h (original)
+++ branches/sid-uploads/ofa-kernel/trunk/kernel_addons/backport/2.6.9_U7/include/linux/spinlock.h Wed Aug 12 22:09:11 2009
@@ -5,6 +5,4 @@
#define spin_lock_nested(lock, subclass) spin_lock(lock)
-#define assert_spin_locked(lock) do { (void)(lock); } while(0)
-
#endif
Modified: branches/sid-uploads/ofa-kernel/trunk/net/rds/connection.c
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/sid-uploads/ofa-kernel/trunk/net/rds/connection.c?rev=451&op=diff
==============================================================================
--- branches/sid-uploads/ofa-kernel/trunk/net/rds/connection.c (original)
+++ branches/sid-uploads/ofa-kernel/trunk/net/rds/connection.c Wed Aug 12 22:09:11 2009
@@ -127,7 +127,7 @@
struct rds_transport *trans, gfp_t gfp,
int is_outgoing)
{
- struct rds_connection *conn, *tmp, *parent = NULL;
+ struct rds_connection *conn, *parent = NULL;
struct hlist_head *head = rds_conn_bucket(laddr, faddr);
unsigned long flags;
int ret;
@@ -217,26 +217,40 @@
trans->t_name ? trans->t_name : "[unknown]",
is_outgoing ? "(outgoing)" : "");
+ /*
+ * Since we ran without holding the conn lock, someone could
+ * have created the same conn (either normal or passive) in the
+ * interim. We check while holding the lock. If we won, we complete
+ * init and return our conn. If we lost, we rollback and return the
+ * other one.
+ */
spin_lock_irqsave(&rds_conn_lock, flags);
- if (parent == NULL) {
- tmp = rds_conn_lookup(head, laddr, faddr, trans);
- if (tmp == NULL)
+ if (parent) {
+ /* Creating passive conn */
+ if (parent->c_passive) {
+ trans->conn_free(conn->c_transport_data);
+ kmem_cache_free(rds_conn_slab, conn);
+ conn = parent->c_passive;
+ } else {
+ parent->c_passive = conn;
+ rds_cong_add_conn(conn);
+ rds_conn_count++;
+ }
+ } else {
+ /* Creating normal conn */
+ struct rds_connection *found;
+
+ found = rds_conn_lookup(head, laddr, faddr, trans);
+ if (found) {
+ trans->conn_free(conn->c_transport_data);
+ kmem_cache_free(rds_conn_slab, conn);
+ conn = found;
+ } else {
hlist_add_head(&conn->c_hash_node, head);
- } else {
- tmp = parent->c_passive;
- if (!tmp)
- parent->c_passive = conn;
- }
-
- if (tmp) {
- trans->conn_free(conn->c_transport_data);
- kmem_cache_free(rds_conn_slab, conn);
- conn = tmp;
- } else {
- rds_cong_add_conn(conn);
- rds_conn_count++;
- }
-
+ rds_cong_add_conn(conn);
+ rds_conn_count++;
+ }
+ }
spin_unlock_irqrestore(&rds_conn_lock, flags);
out:
Modified: branches/sid-uploads/ofa-kernel/trunk/net/rds/ib.c
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/sid-uploads/ofa-kernel/trunk/net/rds/ib.c?rev=451&op=diff
==============================================================================
--- branches/sid-uploads/ofa-kernel/trunk/net/rds/ib.c (original)
+++ branches/sid-uploads/ofa-kernel/trunk/net/rds/ib.c Wed Aug 12 22:09:11 2009
@@ -85,9 +85,6 @@
rds_ibdev->max_wrs = dev_attr->max_qp_wr;
rds_ibdev->max_sge = min(dev_attr->max_sge, RDS_IB_MAX_SGE);
- rds_ibdev->fmr_page_shift = max(9, ffs(dev_attr->page_size_cap) - 1);
- rds_ibdev->fmr_page_size = 1 << rds_ibdev->fmr_page_shift;
- rds_ibdev->fmr_page_mask = ~((u64) rds_ibdev->fmr_page_size - 1);
rds_ibdev->fmr_max_remaps = dev_attr->max_map_per_fmr?: 32;
rds_ibdev->max_fmrs = dev_attr->max_fmr ?
min_t(unsigned int, dev_attr->max_fmr, fmr_pool_size) :
Modified: branches/sid-uploads/ofa-kernel/trunk/net/rds/ib.h
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/sid-uploads/ofa-kernel/trunk/net/rds/ib.h?rev=451&op=diff
==============================================================================
--- branches/sid-uploads/ofa-kernel/trunk/net/rds/ib.h (original)
+++ branches/sid-uploads/ofa-kernel/trunk/net/rds/ib.h Wed Aug 12 22:09:11 2009
@@ -159,9 +159,6 @@
struct ib_pd *pd;
struct ib_mr *mr;
struct rds_ib_mr_pool *mr_pool;
- int fmr_page_shift;
- int fmr_page_size;
- u64 fmr_page_mask;
unsigned int fmr_max_remaps;
unsigned int max_fmrs;
int max_sge;
Modified: branches/sid-uploads/ofa-kernel/trunk/net/rds/ib_rdma.c
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/sid-uploads/ofa-kernel/trunk/net/rds/ib_rdma.c?rev=451&op=diff
==============================================================================
--- branches/sid-uploads/ofa-kernel/trunk/net/rds/ib_rdma.c (original)
+++ branches/sid-uploads/ofa-kernel/trunk/net/rds/ib_rdma.c Wed Aug 12 22:09:11 2009
@@ -211,7 +211,7 @@
pool->fmr_attr.max_pages = fmr_message_size;
pool->fmr_attr.max_maps = rds_ibdev->fmr_max_remaps;
- pool->fmr_attr.page_shift = rds_ibdev->fmr_page_shift;
+ pool->fmr_attr.page_shift = PAGE_SHIFT;
pool->max_free_pinned = rds_ibdev->max_fmrs * fmr_message_size / 4;
/* We never allow more than max_items MRs to be allocated.
@@ -349,13 +349,13 @@
unsigned int dma_len = ib_sg_dma_len(dev, &scat[i]);
u64 dma_addr = ib_sg_dma_address(dev, &scat[i]);
- if (dma_addr & ~rds_ibdev->fmr_page_mask) {
+ if (dma_addr & ~PAGE_MASK) {
if (i > 0)
return -EINVAL;
else
++page_cnt;
}
- if ((dma_addr + dma_len) & ~rds_ibdev->fmr_page_mask) {
+ if ((dma_addr + dma_len) & ~PAGE_MASK) {
if (i < sg_dma_len - 1)
return -EINVAL;
else
@@ -365,7 +365,7 @@
len += dma_len;
}
- page_cnt += len >> rds_ibdev->fmr_page_shift;
+ page_cnt += len >> PAGE_SHIFT;
if (page_cnt > fmr_message_size)
return -EINVAL;
@@ -378,9 +378,9 @@
unsigned int dma_len = ib_sg_dma_len(dev, &scat[i]);
u64 dma_addr = ib_sg_dma_address(dev, &scat[i]);
- for (j = 0; j < dma_len; j += rds_ibdev->fmr_page_size)
+ for (j = 0; j < dma_len; j += PAGE_SIZE)
dma_pages[page_cnt++] =
- (dma_addr & rds_ibdev->fmr_page_mask) + j;
+ (dma_addr & PAGE_MASK) + j;
}
ret = ib_map_phys_fmr(ibmr->fmr,
Modified: branches/sid-uploads/ofa-kernel/trunk/net/rds/iw.c
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/sid-uploads/ofa-kernel/trunk/net/rds/iw.c?rev=451&op=diff
==============================================================================
--- branches/sid-uploads/ofa-kernel/trunk/net/rds/iw.c (original)
+++ branches/sid-uploads/ofa-kernel/trunk/net/rds/iw.c Wed Aug 12 22:09:11 2009
@@ -83,23 +83,16 @@
rds_iwdev->max_wrs = dev_attr->max_qp_wr;
rds_iwdev->max_sge = min(dev_attr->max_sge, RDS_IW_MAX_SGE);
- rds_iwdev->page_shift = max(PAGE_SHIFT, ffs(dev_attr->page_size_cap) - 1);
-
rds_iwdev->dev = device;
rds_iwdev->pd = ib_alloc_pd(device);
if (IS_ERR(rds_iwdev->pd))
goto free_dev;
if (!rds_iwdev->dma_local_lkey) {
- if (device->node_type != RDMA_NODE_RNIC) {
- rds_iwdev->mr = ib_get_dma_mr(rds_iwdev->pd,
- IB_ACCESS_LOCAL_WRITE);
- } else {
- rds_iwdev->mr = ib_get_dma_mr(rds_iwdev->pd,
- IB_ACCESS_REMOTE_READ |
- IB_ACCESS_REMOTE_WRITE |
- IB_ACCESS_LOCAL_WRITE);
- }
+ rds_iwdev->mr = ib_get_dma_mr(rds_iwdev->pd,
+ IB_ACCESS_REMOTE_READ |
+ IB_ACCESS_REMOTE_WRITE |
+ IB_ACCESS_LOCAL_WRITE);
if (IS_ERR(rds_iwdev->mr))
goto err_pd;
} else
Modified: branches/sid-uploads/ofa-kernel/trunk/net/rds/iw.h
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/sid-uploads/ofa-kernel/trunk/net/rds/iw.h?rev=451&op=diff
==============================================================================
--- branches/sid-uploads/ofa-kernel/trunk/net/rds/iw.h (original)
+++ branches/sid-uploads/ofa-kernel/trunk/net/rds/iw.h Wed Aug 12 22:09:11 2009
@@ -181,7 +181,6 @@
struct ib_pd *pd;
struct ib_mr *mr;
struct rds_iw_mr_pool *mr_pool;
- int page_shift;
int max_sge;
unsigned int max_wrs;
unsigned int dma_local_lkey:1;
Modified: branches/sid-uploads/ofa-kernel/trunk/net/rds/iw_rdma.c
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/sid-uploads/ofa-kernel/trunk/net/rds/iw_rdma.c?rev=451&op=diff
==============================================================================
--- branches/sid-uploads/ofa-kernel/trunk/net/rds/iw_rdma.c (original)
+++ branches/sid-uploads/ofa-kernel/trunk/net/rds/iw_rdma.c Wed Aug 12 22:09:11 2009
@@ -261,17 +261,11 @@
}
static u64 *rds_iw_map_scatterlist(struct rds_iw_device *rds_iwdev,
- struct rds_iw_scatterlist *sg,
- unsigned int dma_page_shift)
+ struct rds_iw_scatterlist *sg)
{
struct ib_device *dev = rds_iwdev->dev;
u64 *dma_pages = NULL;
- u64 dma_mask;
- unsigned int dma_page_size;
int i, j, ret;
-
- dma_page_size = 1 << dma_page_shift;
- dma_mask = dma_page_size - 1;
WARN_ON(sg->dma_len);
@@ -293,18 +287,18 @@
sg->bytes += dma_len;
end_addr = dma_addr + dma_len;
- if (dma_addr & dma_mask) {
+ if (dma_addr & PAGE_MASK) {
if (i > 0)
goto out_unmap;
- dma_addr &= ~dma_mask;
+ dma_addr &= ~PAGE_MASK;
}
- if (end_addr & dma_mask) {
+ if (end_addr & PAGE_MASK) {
if (i < sg->dma_len - 1)
goto out_unmap;
- end_addr = (end_addr + dma_mask) & ~dma_mask;
+ end_addr = (end_addr + PAGE_MASK) & ~PAGE_MASK;
}
- sg->dma_npages += (end_addr - dma_addr) >> dma_page_shift;
+ sg->dma_npages += (end_addr - dma_addr) >> PAGE_SHIFT;
}
/* Now gather the dma addrs into one list */
@@ -323,8 +317,8 @@
u64 end_addr;
end_addr = dma_addr + dma_len;
- dma_addr &= ~dma_mask;
- for (; dma_addr < end_addr; dma_addr += dma_page_size)
+ dma_addr &= ~PAGE_MASK;
+ for (; dma_addr < end_addr; dma_addr += PAGE_SIZE)
dma_pages[j++] = dma_addr;
BUG_ON(j > sg->dma_npages);
}
@@ -724,7 +718,7 @@
f_wr.wr.fast_reg.rkey = mapping->m_rkey;
f_wr.wr.fast_reg.page_list = ibmr->page_list;
f_wr.wr.fast_reg.page_list_len = mapping->m_sg.dma_len;
- f_wr.wr.fast_reg.page_shift = ibmr->device->page_shift;
+ f_wr.wr.fast_reg.page_shift = PAGE_SHIFT;
f_wr.wr.fast_reg.access_flags = IB_ACCESS_LOCAL_WRITE |
IB_ACCESS_REMOTE_READ |
IB_ACCESS_REMOTE_WRITE;
@@ -781,9 +775,7 @@
rds_iw_set_scatterlist(&mapping->m_sg, sg, sg_len);
- dma_pages = rds_iw_map_scatterlist(rds_iwdev,
- &mapping->m_sg,
- rds_iwdev->page_shift);
+ dma_pages = rds_iw_map_scatterlist(rds_iwdev, &mapping->m_sg);
if (IS_ERR(dma_pages)) {
ret = PTR_ERR(dma_pages);
dma_pages = NULL;
Modified: branches/sid-uploads/ofa-kernel/trunk/net/rds/iw_send.c
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/sid-uploads/ofa-kernel/trunk/net/rds/iw_send.c?rev=451&op=diff
==============================================================================
--- branches/sid-uploads/ofa-kernel/trunk/net/rds/iw_send.c (original)
+++ branches/sid-uploads/ofa-kernel/trunk/net/rds/iw_send.c Wed Aug 12 22:09:11 2009
@@ -780,7 +780,7 @@
send->s_wr.wr.fast_reg.rkey = send->s_mr->rkey;
send->s_wr.wr.fast_reg.page_list = send->s_page_list;
send->s_wr.wr.fast_reg.page_list_len = nent;
- send->s_wr.wr.fast_reg.page_shift = rds_iwdev->page_shift;
+ send->s_wr.wr.fast_reg.page_shift = PAGE_SHIFT;
send->s_wr.wr.fast_reg.access_flags = IB_ACCESS_REMOTE_WRITE;
send->s_wr.wr.fast_reg.iova_start = sg_addr;
Modified: branches/sid-uploads/ofa-kernel/trunk/net/rds/recv.c
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/sid-uploads/ofa-kernel/trunk/net/rds/recv.c?rev=451&op=diff
==============================================================================
--- branches/sid-uploads/ofa-kernel/trunk/net/rds/recv.c (original)
+++ branches/sid-uploads/ofa-kernel/trunk/net/rds/recv.c Wed Aug 12 22:09:11 2009
@@ -417,18 +417,18 @@
if (msg_flags & MSG_OOB)
goto out;
- /* If there are pending notifications, do those - and nothing else */
- if (!list_empty(&rs->rs_notify_queue)) {
- ret = rds_notify_queue_get(rs, msg);
- goto out;
- }
-
- if (rs->rs_cong_notify) {
- ret = rds_notify_cong(rs, msg);
- goto out;
- }
-
while (1) {
+ /* If there are pending notifications, do those - and nothing else */
+ if (!list_empty(&rs->rs_notify_queue)) {
+ ret = rds_notify_queue_get(rs, msg);
+ break;
+ }
+
+ if (rs->rs_cong_notify) {
+ ret = rds_notify_cong(rs, msg);
+ break;
+ }
+
if (!rds_next_incoming(rs, &inc)) {
if (nonblock) {
ret = -EAGAIN;
@@ -436,7 +436,9 @@
}
timeo = wait_event_interruptible_timeout(*sk->sk_sleep,
- rds_next_incoming(rs, &inc),
+ (!list_empty(&rs->rs_notify_queue)
+ || rs->rs_cong_notify
+ || rds_next_incoming(rs, &inc)),
timeo);
rdsdebug("recvmsg woke inc %p timeo %ld\n", inc,
timeo);
More information about the Pkg-ofed-commits
mailing list