datapath: Work around debugging for csum_and_copy_to_user().

Certain versions of XenServer add debugging to csum_and_copy_to_user()
in such a way that it changes the function signature.  This adds a
check and a workaround to allow us to build on these versions.

Signed-off-by: Jesse Gross <jesse@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>

diff --git a/acinclude.m4 b/acinclude.m4
index 0af7fd0fc9ec7aaae5ee7dbfcfbf329123e245f7..2296dbd979950b0a8c51559c94facef5d4fc4418 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -156,6 +156,9 @@ AC_DEFUN([OVS_CHECK_LINUX26_COMPAT], [
   mkdir -p datapath/linux-2.6
   : > datapath/linux-2.6/kcompat.h.new
 
+  OVS_GREP_IFELSE([$KSRC26/arch/x86/include/asm/checksum_32.h], [src_err,],
+                  [OVS_DEFINE([HAVE_CSUM_COPY_DBG])])
+
   OVS_GREP_IFELSE([$KSRC26/include/linux/err.h], [ERR_CAST],
                   [OVS_DEFINE([HAVE_ERR_CAST])])
 

diff --git a/datapath/linux-2.6/compat-2.6/include/net/checksum.h b/datapath/linux-2.6/compat-2.6/include/net/checksum.h
index 3b6debb1d1c28741b2715bbade32b50be71d89e1..96fd3a6986c8b30427e56b15e204fbaececc522c 100644 (file)
--- a/datapath/linux-2.6/compat-2.6/include/net/checksum.h
+++ b/datapath/linux-2.6/compat-2.6/include/net/checksum.h
@@ -10,4 +10,12 @@ static inline __wsum csum_unfold(__sum16 n)
 }
 #endif /* !HAVE_CSUM_UNFOLD */
 
+/* Workaround for debugging included in certain versions of XenServer.  It only
+ * applies to 32-bit x86.
+ */
+#if defined(HAVE_CSUM_COPY_DBG) && defined(CONFIG_X86_32)
+#define csum_and_copy_to_user(src, dst, len, sum, err_ptr) \
+       csum_and_copy_to_user(src, dst, len, sum, NULL, err_ptr)
+#endif
+
 #endif /* checksum.h */