mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-08-17 20:56:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed compilation problem when any module using net_get_page()/net_put_page() built as a module.

Browse Source 
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@168 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Vladislav Bolkhovitin
2007-08-23 16:00:57 +00:00
parent 918c113858
commit 715cc7edb3
4 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
iscsi-scst/kernel/patches/put_page_callback-2.6.16.patch
+5 -2
View File
@@ -118,7 +118,7 @@ diff -upr linux-2.6.16.29/net/core/skbuff.c linux-2.6.16.29/net/core/skbuff.c
skb_shinfo(skb)->frags[i].size = len - pos;
diff -upr linux-2.6.16.29/net/core/utils.c linux-2.6.16.29/net/core/utils.c
--- linux-2.6.16.29/net/core/utils.c 2006-09-12 22:02:10.000000000 +0400
+++ linux-2.6.16.29/net/core/utils.c 2007-08-07 19:54:27.000000000 +0400
+++ linux-2.6.16.29/net/core/utils.c 2007-08-23 19:54:03.000000000 +0400
@@ -24,11 +24,15 @@
#include <linux/random.h>
#include <linux/percpu.h>
@@ -135,7 +135,7 @@ diff -upr linux-2.6.16.29/net/core/utils.c linux-2.6.16.29/net/core/utils.c
/*
This is a maximally equidistributed combined Tausworthe generator
based on code from GNU Scientific Library 1.5 (30 Jun 2004)
@@ -190,3 +194,29 @@ __be32 in_aton(const char *str)
@@ -190,3 +194,32 @@ __be32 in_aton(const char *str)
}
EXPORT_SYMBOL(in_aton);
@@ -165,6 +165,9 @@ diff -upr linux-2.6.16.29/net/core/utils.c linux-2.6.16.29/net/core/utils.c
+ return res;
+}
+EXPORT_SYMBOL(net_set_get_put_page_callbacks);
+
+EXPORT_SYMBOL(net_get_page_callback);
+EXPORT_SYMBOL(net_put_page_callback);
diff -upr linux-2.6.16.29/net/ipv4/ip_output.c linux-2.6.16.29/net/ipv4/ip_output.c
--- linux-2.6.16.29/net/ipv4/ip_output.c 2006-09-12 22:02:10.000000000 +0400
+++ linux-2.6.16.29/net/ipv4/ip_output.c 2007-08-07 19:54:27.000000000 +0400
iscsi-scst/kernel/patches/put_page_callback-2.6.18.patch
+5 -2
View File
@@ -127,7 +127,7 @@ diff -upr linux-2.6.18.1/net/core/skbuff.c linux-2.6.18.1/net/core/skbuff.c
if (pos < offset) {
diff -upr linux-2.6.18.1/net/core/utils.c linux-2.6.18.1/net/core/utils.c
--- linux-2.6.18.1/net/core/utils.c 2006-09-20 07:42:06.000000000 +0400
+++ linux-2.6.18.1/net/core/utils.c 2007-08-07 19:36:59.000000000 +0400
+++ linux-2.6.18.1/net/core/utils.c 2007-08-23 19:49:40.000000000 +0400
@@ -24,11 +24,15 @@
#include <linux/random.h>
#include <linux/percpu.h>
@@ -144,7 +144,7 @@ diff -upr linux-2.6.18.1/net/core/utils.c linux-2.6.18.1/net/core/utils.c
/*
This is a maximally equidistributed combined Tausworthe generator
based on code from GNU Scientific Library 1.5 (30 Jun 2004)
@@ -191,3 +195,29 @@ __be32 in_aton(const char *str)
@@ -191,3 +195,32 @@ __be32 in_aton(const char *str)
}
EXPORT_SYMBOL(in_aton);
@@ -174,6 +174,9 @@ diff -upr linux-2.6.18.1/net/core/utils.c linux-2.6.18.1/net/core/utils.c
+ return res;
+}
+EXPORT_SYMBOL(net_set_get_put_page_callbacks);
+
+EXPORT_SYMBOL(net_get_page_callback);
+EXPORT_SYMBOL(net_put_page_callback);
diff -upr linux-2.6.18.1/net/ipv4/ip_output.c linux-2.6.18.1/net/ipv4/ip_output.c
--- linux-2.6.18.1/net/ipv4/ip_output.c 2006-09-20 07:42:06.000000000 +0400
+++ linux-2.6.18.1/net/ipv4/ip_output.c 2007-08-07 19:37:24.000000000 +0400
iscsi-scst/kernel/patches/put_page_callback-2.6.21.patch
+5 -2
View File
@@ -127,7 +127,7 @@ diff -upr linux-2.6.21.1/net/core/skbuff.c linux-2.6.21.1/net/core/skbuff.c
if (pos < offset) {
diff -upr linux-2.6.21.1/net/core/utils.c linux-2.6.21.1/net/core/utils.c
--- linux-2.6.21.1/net/core/utils.c 2007-04-28 01:49:26.000000000 +0400
+++ linux-2.6.21.1/net/core/utils.c 2007-07-25 12:17:19.000000000 +0400
+++ linux-2.6.21.1/net/core/utils.c 2007-08-23 19:38:32.000000000 +0400
@@ -25,6 +25,7 @@
#include <linux/random.h>
#include <linux/percpu.h>
@@ -146,7 +146,7 @@ diff -upr linux-2.6.21.1/net/core/utils.c linux-2.6.21.1/net/core/utils.c
/*
* All net warning printk()s should be guarded by this function.
*/
@@ -290,3 +294,29 @@ out:
@@ -290,3 +294,32 @@ out:
}
EXPORT_SYMBOL(in6_pton);
@@ -176,6 +176,9 @@ diff -upr linux-2.6.21.1/net/core/utils.c linux-2.6.21.1/net/core/utils.c
+ return res;
+}
+EXPORT_SYMBOL(net_set_get_put_page_callbacks);
+
+EXPORT_SYMBOL(net_get_page_callback);
+EXPORT_SYMBOL(net_put_page_callback);
diff -upr linux-2.6.21.1/net/ipv4/ip_output.c linux-2.6.21.1/net/ipv4/ip_output.c
--- linux-2.6.21.1/net/ipv4/ip_output.c 2007-04-28 01:49:26.000000000 +0400
+++ linux-2.6.21.1/net/ipv4/ip_output.c 2007-07-04 13:17:53.000000000 +0400
iscsi-scst/kernel/patches/put_page_callback-2.6.22.patch
+5 -2
View File
@@ -127,7 +127,7 @@ diff -upr linux-2.6.22/net/core/skbuff.c linux-2.6.22/net/core/skbuff.c
if (pos < offset) {
diff -upr linux-2.6.22/net/core/utils.c linux-2.6.22/net/core/utils.c
--- linux-2.6.22/net/core/utils.c 2007-07-09 03:32:17.000000000 +0400
+++ linux-2.6.22/net/core/utils.c 2007-08-07 19:12:10.000000000 +0400
+++ linux-2.6.22/net/core/utils.c 2007-08-23 19:44:28.000000000 +0400
@@ -25,6 +25,7 @@
#include <linux/random.h>
#include <linux/percpu.h>
@@ -146,7 +146,7 @@ diff -upr linux-2.6.22/net/core/utils.c linux-2.6.22/net/core/utils.c
/*
* All net warning printk()s should be guarded by this function.
*/
@@ -292,3 +296,29 @@ out:
@@ -292,3 +296,32 @@ out:
}
EXPORT_SYMBOL(in6_pton);
@@ -176,6 +176,9 @@ diff -upr linux-2.6.22/net/core/utils.c linux-2.6.22/net/core/utils.c
+ return res;
+}
+EXPORT_SYMBOL(net_set_get_put_page_callbacks);
+
+EXPORT_SYMBOL(net_get_page_callback);
+EXPORT_SYMBOL(net_put_page_callback);
diff -upr linux-2.6.22/net/ipv4/ip_output.c linux-2.6.22/net/ipv4/ip_output.c
--- linux-2.6.22/net/ipv4/ip_output.c 2007-07-09 03:32:17.000000000 +0400
+++ linux-2.6.22/net/ipv4/ip_output.c 2007-08-07 19:12:10.000000000 +0400