From ad81b1b6ea31aea201cd82262065cfd7dcf71ff5 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Mon, 1 Nov 2010 16:38:28 +0000 Subject: [PATCH] svn merge -c2494 https://scst.svn.sourceforge.net/svnroot/scst/trunk git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/2.0.0.x@2565 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- iscsi-scst/kernel/patches/put_page_callback-2.6.36.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/iscsi-scst/kernel/patches/put_page_callback-2.6.36.patch b/iscsi-scst/kernel/patches/put_page_callback-2.6.36.patch index a8984a9e4..0939e445f 100644 --- a/iscsi-scst/kernel/patches/put_page_callback-2.6.36.patch +++ b/iscsi-scst/kernel/patches/put_page_callback-2.6.36.patch @@ -304,7 +304,7 @@ diff -upkr linux-2.6.36/net/ipv4/tcp_output.c linux-2.6.36/net/ipv4/tcp_output.c diff -upkr linux-2.6.36/net/ipv4/tcp_zero_copy.c linux-2.6.36/net/ipv4/tcp_zero_copy.c --- linux-2.6.36/net/ipv4/tcp_zero_copy.c 2010-10-26 12:02:24.519252006 +0400 +++ linux-2.6.36/net/ipv4/tcp_zero_copy.c 2010-10-26 12:01:40.659752056 +0400 -@@ -1 +1,49 @@ +@@ -0,0 +1,49 @@ +/* + * Support routines for TCP zero copy transmit + * @@ -314,7 +314,7 @@ diff -upkr linux-2.6.36/net/ipv4/tcp_zero_copy.c linux-2.6.36/net/ipv4/tcp_zero_ + * modify it under the terms of the GNU General Public License + * version 2 as published by the Free Software Foundation. + */ - ++ +#include + +net_get_page_callback_t net_get_page_callback __read_mostly;