mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-25 07:51:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Patch header update for the 2.6.36 patches (does not build yet !)

Browse Source 
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@2430 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2010-10-21 12:22:28 +00:00
parent 3667335dca
commit 56d40a5505
4 changed files with 51 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
iscsi-scst/kernel/patches/put_page_callback-2.6.36.patch
View File

@@ -1,6 +1,6 @@
diff -upkr linux-2.6.35/include/linux/mm_types.h linux-2.6.35/include/linux/mm_types.h
--- linux-2.6.35/include/linux/mm_types.h 2010-05-17 01:17:36.000000000 +0400
+++ linux-2.6.35/include/linux/mm_types.h 2010-05-24 14:51:40.000000000 +0400
diff -upkr linux-2.6.36/include/linux/mm_types.h linux-2.6.36/include/linux/mm_types.h
--- linux-2.6.36/include/linux/mm_types.h 2010-05-17 01:17:36.000000000 +0400
+++ linux-2.6.36/include/linux/mm_types.h 2010-05-24 14:51:40.000000000 +0400
@@ -100,6 +100,18 @@ struct page {
*/
void *shadow;
@@ -20,9 +20,9 @@ diff -upkr linux-2.6.35/include/linux/mm_types.h linux-2.6.35/include/linux/mm_t
};
/*
diff -upkr linux-2.6.35/include/linux/net.h linux-2.6.35/include/linux/net.h
--- linux-2.6.35/include/linux/net.h 2010-05-17 01:17:36.000000000 +0400
+++ linux-2.6.35/include/linux/net.h 2010-05-24 14:51:40.000000000 +0400
diff -upkr linux-2.6.36/include/linux/net.h linux-2.6.36/include/linux/net.h
--- linux-2.6.36/include/linux/net.h 2010-05-17 01:17:36.000000000 +0400
+++ linux-2.6.36/include/linux/net.h 2010-05-24 14:51:40.000000000 +0400
@@ -20,6 +20,7 @@
#include <linux/socket.h>
@@ -76,9 +76,9 @@ diff -upkr linux-2.6.35/include/linux/net.h linux-2.6.35/include/linux/net.h
+
#endif /* __KERNEL__ */
#endif /* _LINUX_NET_H */
diff -upkr linux-2.6.35/net/core/dev.c linux-2.6.35/net/core/dev.c
--- linux-2.6.35/net/core/dev.c 2010-05-17 01:17:36.000000000 +0400
+++ linux-2.6.35/net/core/dev.c 2010-05-24 14:51:40.000000000 +0400
diff -upkr linux-2.6.36/net/core/dev.c linux-2.6.36/net/core/dev.c
--- linux-2.6.36/net/core/dev.c 2010-05-17 01:17:36.000000000 +0400
+++ linux-2.6.36/net/core/dev.c 2010-05-24 14:51:40.000000000 +0400
@@ -3130,7 +3130,7 @@ pull:
skb_shinfo(skb)->frags[0].size -= grow;
@@ -88,9 +88,9 @@ diff -upkr linux-2.6.35/net/core/dev.c linux-2.6.35/net/core/dev.c
memmove(skb_shinfo(skb)->frags,
skb_shinfo(skb)->frags + 1,
--skb_shinfo(skb)->nr_frags);
diff -upkr linux-2.6.35/net/core/skbuff.c linux-2.6.35/net/core/skbuff.c
--- linux-2.6.35/net/core/skbuff.c 2010-05-17 01:17:36.000000000 +0400
+++ linux-2.6.35/net/core/skbuff.c 2010-05-24 14:51:40.000000000 +0400
diff -upkr linux-2.6.36/net/core/skbuff.c linux-2.6.36/net/core/skbuff.c
--- linux-2.6.36/net/core/skbuff.c 2010-05-17 01:17:36.000000000 +0400
+++ linux-2.6.36/net/core/skbuff.c 2010-05-24 14:51:40.000000000 +0400
@@ -76,13 +76,13 @@ static struct kmem_cache *skbuff_fclone_
static void sock_pipe_buf_release(struct pipe_inode_info *pipe,
struct pipe_buffer *buf)
@@ -224,9 +224,9 @@ diff -upkr linux-2.6.35/net/core/skbuff.c linux-2.6.35/net/core/skbuff.c
size = frag->size;
if (pos < offset) {
diff -upkr linux-2.6.35/net/ipv4/ip_output.c linux-2.6.35/net/ipv4/ip_output.c
--- linux-2.6.35/net/ipv4/ip_output.c 2010-05-17 01:17:36.000000000 +0400
+++ linux-2.6.35/net/ipv4/ip_output.c 2010-05-24 14:51:40.000000000 +0400
diff -upkr linux-2.6.36/net/ipv4/ip_output.c linux-2.6.36/net/ipv4/ip_output.c
--- linux-2.6.36/net/ipv4/ip_output.c 2010-05-17 01:17:36.000000000 +0400
+++ linux-2.6.36/net/ipv4/ip_output.c 2010-05-24 14:51:40.000000000 +0400
@@ -1035,7 +1035,7 @@ alloc_new_skb:
err = -EMSGSIZE;
goto error;
@@ -245,9 +245,9 @@ diff -upkr linux-2.6.35/net/ipv4/ip_output.c linux-2.6.35/net/ipv4/ip_output.c
skb_fill_page_desc(skb, i, page, offset, len);
} else {
err = -EMSGSIZE;
diff -upkr linux-2.6.35/net/ipv4/Makefile linux-2.6.35/net/ipv4/Makefile
--- linux-2.6.35/net/ipv4/Makefile 2010-05-17 01:17:36.000000000 +0400
+++ linux-2.6.35/net/ipv4/Makefile 2010-05-24 14:51:40.000000000 +0400
diff -upkr linux-2.6.36/net/ipv4/Makefile linux-2.6.36/net/ipv4/Makefile
--- linux-2.6.36/net/ipv4/Makefile 2010-05-17 01:17:36.000000000 +0400
+++ linux-2.6.36/net/ipv4/Makefile 2010-05-24 14:51:40.000000000 +0400
@@ -49,6 +49,7 @@ obj-$(CONFIG_TCP_CONG_LP) += tcp_lp.o
obj-$(CONFIG_TCP_CONG_YEAH) += tcp_yeah.o
obj-$(CONFIG_TCP_CONG_ILLINOIS) += tcp_illinois.o
@@ -256,9 +256,9 @@ diff -upkr linux-2.6.35/net/ipv4/Makefile linux-2.6.35/net/ipv4/Makefile
obj-$(CONFIG_XFRM) += xfrm4_policy.o xfrm4_state.o xfrm4_input.o \
xfrm4_output.o
diff -upkr linux-2.6.35/net/ipv4/tcp.c linux-2.6.35/net/ipv4/tcp.c
--- linux-2.6.35/net/ipv4/tcp.c 2010-05-17 01:17:36.000000000 +0400
+++ linux-2.6.35/net/ipv4/tcp.c 2010-05-24 14:51:40.000000000 +0400
diff -upkr linux-2.6.36/net/ipv4/tcp.c linux-2.6.36/net/ipv4/tcp.c
--- linux-2.6.36/net/ipv4/tcp.c 2010-05-17 01:17:36.000000000 +0400
+++ linux-2.6.36/net/ipv4/tcp.c 2010-05-24 14:51:40.000000000 +0400
@@ -801,7 +801,7 @@ new_segment:
if (can_coalesce) {
skb_shinfo(skb)->frags[i - 1].size += copy;
@@ -289,9 +289,9 @@ diff -upkr linux-2.6.35/net/ipv4/tcp.c linux-2.6.35/net/ipv4/tcp.c
TCP_PAGE(sk) = page;
}
}
diff -upkr linux-2.6.35/net/ipv4/tcp_output.c linux-2.6.35/net/ipv4/tcp_output.c
--- linux-2.6.35/net/ipv4/tcp_output.c 2010-05-17 01:17:36.000000000 +0400
+++ linux-2.6.35/net/ipv4/tcp_output.c 2010-05-24 14:51:40.000000000 +0400
diff -upkr linux-2.6.36/net/ipv4/tcp_output.c linux-2.6.36/net/ipv4/tcp_output.c
--- linux-2.6.36/net/ipv4/tcp_output.c 2010-05-17 01:17:36.000000000 +0400
+++ linux-2.6.36/net/ipv4/tcp_output.c 2010-05-24 14:51:40.000000000 +0400
@@ -1085,7 +1085,7 @@ static void __pskb_trim_head(struct sk_b
k = 0;
for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
@@ -301,9 +301,9 @@ diff -upkr linux-2.6.35/net/ipv4/tcp_output.c linux-2.6.35/net/ipv4/tcp_output.c
eat -= skb_shinfo(skb)->frags[i].size;
} else {
skb_shinfo(skb)->frags[k] = skb_shinfo(skb)->frags[i];
diff -upkr linux-2.6.35/net/ipv4/tcp_zero_copy.c linux-2.6.35/net/ipv4/tcp_zero_copy.c
--- linux-2.6.35/net/ipv4/tcp_zero_copy.c 2010-03-01 17:30:31.000000000 +0300
+++ linux-2.6.35/net/ipv4/tcp_zero_copy.c 2010-05-24 14:51:40.000000000 +0400
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-03-01 17:30:31.000000000 +0300
+++ linux-2.6.36/net/ipv4/tcp_zero_copy.c 2010-05-24 14:51:40.000000000 +0400
@@ -0,0 +1,49 @@
+/*
+ * Support routines for TCP zero copy transmit
@@ -354,9 +354,9 @@ diff -upkr linux-2.6.35/net/ipv4/tcp_zero_copy.c linux-2.6.35/net/ipv4/tcp_zero_
+ return res;
+}
+EXPORT_SYMBOL(net_set_get_put_page_callbacks);
diff -upkr linux-2.6.35/net/ipv6/ip6_output.c linux-2.6.35/net/ipv6/ip6_output.c
--- linux-2.6.35/net/ipv6/ip6_output.c 2010-05-17 01:17:36.000000000 +0400
+++ linux-2.6.35/net/ipv6/ip6_output.c 2010-05-24 14:51:40.000000000 +0400
diff -upkr linux-2.6.36/net/ipv6/ip6_output.c linux-2.6.36/net/ipv6/ip6_output.c
--- linux-2.6.36/net/ipv6/ip6_output.c 2010-05-17 01:17:36.000000000 +0400
+++ linux-2.6.36/net/ipv6/ip6_output.c 2010-05-24 14:51:40.000000000 +0400
@@ -1383,7 +1383,7 @@ alloc_new_skb:
err = -EMSGSIZE;
goto error;
@@ -366,9 +366,9 @@ diff -upkr linux-2.6.35/net/ipv6/ip6_output.c linux-2.6.35/net/ipv6/ip6_output.c
skb_fill_page_desc(skb, i, page, sk->sk_sndmsg_off, 0);
frag = &skb_shinfo(skb)->frags[i];
}
diff -upkr linux-2.6.35/net/Kconfig linux-2.6.35/net/Kconfig
--- linux-2.6.35/net/Kconfig 2010-05-17 01:17:36.000000000 +0400
+++ linux-2.6.35/net/Kconfig 2010-05-24 14:51:40.000000000 +0400
diff -upkr linux-2.6.36/net/Kconfig linux-2.6.36/net/Kconfig
--- linux-2.6.36/net/Kconfig 2010-05-17 01:17:36.000000000 +0400
+++ linux-2.6.36/net/Kconfig 2010-05-24 14:51:40.000000000 +0400
@@ -72,6 +72,18 @@ config INET
Short answer: say Y.

6
scst/kernel/in-tree/Kconfig.drivers.Linux-2.6.36.patch
View File

@@ -1,6 +1,6 @@
diff -upkr -X linux-2.6.35/Documentation/dontdiff linux-2.6.35/drivers/Kconfig linux-2.6.35/drivers/Kconfig
--- linux-2.6.35/drivers/Kconfig 2008-07-14 01:51:29.000000000 +0400
+++ linux-2.6.35/drivers/Kconfig 2008-07-24 14:14:46.000000000 +0400
diff -upkr -X linux-2.6.36/Documentation/dontdiff linux-2.6.36/drivers/Kconfig linux-2.6.36/drivers/Kconfig
--- linux-2.6.36/drivers/Kconfig 2008-07-14 01:51:29.000000000 +0400
+++ linux-2.6.36/drivers/Kconfig 2008-07-24 14:14:46.000000000 +0400
@@ -22,6 +22,8 @@ source "drivers/ide/Kconfig"
source "drivers/scsi/Kconfig"

6
scst/kernel/in-tree/Makefile.drivers.Linux-2.6.36.patch
View File

@@ -1,6 +1,6 @@
diff -upkr -X linux-2.6.35/Documentation/dontdiff linux-2.6.35/drivers/Makefile linux-2.6.35/drivers/Makefile
--- linux-2.6.35/drivers/Makefile.orig 2010-10-16 15:40:04.000000000 +0200
+++ linux-2.6.35/drivers/Makefile 2010-10-16 15:40:20.000000000 +0200
diff -upkr -X linux-2.6.36/Documentation/dontdiff linux-2.6.36/drivers/Makefile linux-2.6.36/drivers/Makefile
--- linux-2.6.36/drivers/Makefile.orig 2010-10-16 15:40:04.000000000 +0200
+++ linux-2.6.36/drivers/Makefile 2010-10-16 15:40:20.000000000 +0200
@@ -113,3 +113,4 @@ obj-$(CONFIG_VLYNQ) += vlynq/
obj-$(CONFIG_STAGING) += staging/
obj-y += platform/

24
scst/kernel/scst_exec_req_fifo-2.6.36.patch
View File

@@ -1,6 +1,6 @@
diff -upkr linux-2.6.35/block/blk-map.c linux-2.6.35/block/blk-map.c
--- linux-2.6.35/block/blk-map.c 2010-05-17 01:17:36.000000000 +0400
+++ linux-2.6.35/block/blk-map.c 2010-05-24 15:19:49.000000000 +0400
diff -upkr linux-2.6.36/block/blk-map.c linux-2.6.36/block/blk-map.c
--- linux-2.6.36/block/blk-map.c 2010-05-17 01:17:36.000000000 +0400
+++ linux-2.6.36/block/blk-map.c 2010-05-24 15:19:49.000000000 +0400
@@ -5,6 +5,8 @@
#include <linux/module.h>
#include <linux/bio.h>
@@ -349,9 +349,9 @@ diff -upkr linux-2.6.35/block/blk-map.c linux-2.6.35/block/blk-map.c
/**
* blk_rq_map_kern - map kernel data to a request, for REQ_TYPE_BLOCK_PC usage
* @q: request queue where request should be inserted
diff -upkr linux-2.6.35/include/linux/blkdev.h linux-2.6.35/include/linux/blkdev.h
--- linux-2.6.35/include/linux/blkdev.h 2010-05-17 01:17:36.000000000 +0400
+++ linux-2.6.35/include/linux/blkdev.h 2010-05-24 14:51:22.000000000 +0400
diff -upkr linux-2.6.36/include/linux/blkdev.h linux-2.6.36/include/linux/blkdev.h
--- linux-2.6.36/include/linux/blkdev.h 2010-05-17 01:17:36.000000000 +0400
+++ linux-2.6.36/include/linux/blkdev.h 2010-05-24 14:51:22.000000000 +0400
@@ -717,6 +717,8 @@ extern unsigned long blk_max_low_pfn, bl
#define BLK_DEFAULT_SG_TIMEOUT (60 * HZ)
#define BLK_MIN_SG_TIMEOUT (7 * HZ)
@@ -371,9 +371,9 @@ diff -upkr linux-2.6.35/include/linux/blkdev.h linux-2.6.35/include/linux/blkdev
extern int blk_execute_rq(struct request_queue *, struct gendisk *,
struct request *, int);
extern void blk_execute_rq_nowait(struct request_queue *, struct gendisk *,
diff -upkr linux-2.6.35/include/linux/scatterlist.h linux-2.6.35/include/linux/scatterlist.h
--- linux-2.6.35/include/linux/scatterlist.h 2010-05-17 01:17:36.000000000 +0400
+++ linux-2.6.35/include/linux/scatterlist.h 2010-05-24 14:51:22.000000000 +0400
diff -upkr linux-2.6.36/include/linux/scatterlist.h linux-2.6.36/include/linux/scatterlist.h
--- linux-2.6.36/include/linux/scatterlist.h 2010-05-17 01:17:36.000000000 +0400
+++ linux-2.6.36/include/linux/scatterlist.h 2010-05-24 14:51:22.000000000 +0400
@@ -3,6 +3,7 @@
#include <asm/types.h>
@@ -393,9 +393,9 @@ diff -upkr linux-2.6.35/include/linux/scatterlist.h linux-2.6.35/include/linux/s
/*
* Maximum number of entries that will be allocated in one piece, if
* a list larger than this is required then chaining will be utilized.
diff -upkr linux-2.6.35/lib/scatterlist.c linux-2.6.35/lib/scatterlist.c
--- linux-2.6.35/lib/scatterlist.c 2010-05-17 01:17:36.000000000 +0400
+++ linux-2.6.35/lib/scatterlist.c 2010-05-24 14:51:22.000000000 +0400
diff -upkr linux-2.6.36/lib/scatterlist.c linux-2.6.36/lib/scatterlist.c
--- linux-2.6.36/lib/scatterlist.c 2010-05-17 01:17:36.000000000 +0400
+++ linux-2.6.36/lib/scatterlist.c 2010-05-24 14:51:22.000000000 +0400
@@ -494,3 +494,132 @@ size_t sg_copy_to_buffer(struct scatterl
return sg_copy_buffer(sgl, nents, buf, buflen, 1);
}