Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Mahoney <jeffm@suse.de>2007-10-04 17:24:08 +0000
committerJeff Mahoney <jeffm@suse.de>2007-10-04 17:24:08 +0000
commit70eb0b4bb55084ee54b40bd05d012c7c3aa2343c (patch)
treed72a6490ae99939b07828e5d2d82f238928ff6f7
parent313a4b89435e03a8f68615854dae4d6b247285cf (diff)
- patches.suse/kabi-safe-2.6.22.6-tcp_sendmsg: kABI: rework
tcp_sendmsg fix from 2.6.22.6 - patches.suse/kabi-safe-2.6.22.8-snd_mem: kABI: rework ALSA memalloc seq_file change from 2.6.22.8
-rw-r--r--kernel-source.changes18
-rw-r--r--patches.suse/kabi-safe-2.6.22.6-tcp_sendmsg63
-rw-r--r--patches.suse/kabi-safe-2.6.22.8-snd_mem71
-rw-r--r--series.conf7
4 files changed, 159 insertions, 0 deletions
diff --git a/kernel-source.changes b/kernel-source.changes
index 7a625c79f4..c4f7b556fc 100644
--- a/kernel-source.changes
+++ b/kernel-source.changes
@@ -1,4 +1,22 @@
-------------------------------------------------------------------
+Thu Oct 4 19:23:56 CEST 2007 - jeffm@suse.de
+
+- patches.suse/kabi-safe-2.6.22.6-tcp_sendmsg: kABI: rework
+ tcp_sendmsg fix from 2.6.22.6
+- patches.suse/kabi-safe-2.6.22.8-snd_mem: kABI: rework ALSA
+ memalloc seq_file change from 2.6.22.8
+
+-------------------------------------------------------------------
+Thu Oct 4 19:21:21 CEST 2007 - jeffm@suse.de
+
+- patches.suse/kabi-safe-2.6.22.6-tcp_sendmsg: kABI: rework
+ tcp_sendmsg fix from 2.6.22.6
+- patches.suse/kabi-safe-2.6.22.8-snd_mem: kABI: rework ALSA
+ memalloc seq_file change from 2.6.22.8
+- patches.suse/kabi-safe-2.6.22.9-mtd: kABI: revert
+ mtdcore/mtdsuper module merging from 2.6.22.9
+
+-------------------------------------------------------------------
Tue Oct 2 19:55:51 CEST 2007 - lmb@suse.de
- patches.xen/handle-bogus-cs-selector-in-single-step-instruction-decoding:
diff --git a/patches.suse/kabi-safe-2.6.22.6-tcp_sendmsg b/patches.suse/kabi-safe-2.6.22.6-tcp_sendmsg
new file mode 100644
index 0000000000..ac6e410044
--- /dev/null
+++ b/patches.suse/kabi-safe-2.6.22.6-tcp_sendmsg
@@ -0,0 +1,63 @@
+From: Jeff Mahoney <jeffm@suse.com>
+Subject: [PATCH] kABI: rework tcp_sendmsg fix from 2.6.22.6
+References: None, proactive fix.
+Patch-mainline: Never
+
+ This patch adds a trampoline so we don't change the prototype of tcp_sendmsg.
+
+Signed-off-by: Jeff Mahoney <jeffm@suse.com>
+---
+ include/net/tcp.h | 2 +-
+ net/ipv4/af_inet.c | 8 +++++++-
+ net/ipv4/tcp.c | 3 +--
+ 3 files changed, 9 insertions(+), 4 deletions(-)
+
+--- a/include/net/tcp.h 2007-10-01 15:36:23.000000000 -0400
++++ b/include/net/tcp.h 2007-10-01 15:38:03.000000000 -0400
+@@ -281,7 +281,7 @@ extern int tcp_v4_remember_stamp(struc
+
+ extern int tcp_v4_tw_remember_stamp(struct inet_timewait_sock *tw);
+
+-extern int tcp_sendmsg(struct kiocb *iocb, struct socket *sock,
++extern int tcp_sendmsg(struct kiocb *iocb, struct sock *sk,
+ struct msghdr *msg, size_t size);
+ extern ssize_t tcp_sendpage(struct socket *sock, struct page *page, int offset, size_t size, int flags);
+
+--- a/net/ipv4/af_inet.c 2007-10-01 15:36:23.000000000 -0400
++++ b/net/ipv4/af_inet.c 2007-10-01 15:41:13.000000000 -0400
+@@ -692,6 +692,12 @@ int inet_sendmsg(struct kiocb *iocb, str
+ return sk->sk_prot->sendmsg(iocb, sk, msg, size);
+ }
+
++/* KABI safe workaround for 2.6.22.6 tcp_sendmsg change -jeffm */
++static int inet_tcp_sendmsg(struct kiocb *iocb, struct socket *sock,
++ struct msghdr *msg, size_t size)
++{
++ return tcp_sendmsg(iocb, sock->sk, msg, size);
++}
+
+ static ssize_t inet_sendpage(struct socket *sock, struct page *page, int offset, size_t size, int flags)
+ {
+@@ -831,7 +837,7 @@ const struct proto_ops inet_stream_ops =
+ .shutdown = inet_shutdown,
+ .setsockopt = sock_common_setsockopt,
+ .getsockopt = sock_common_getsockopt,
+- .sendmsg = tcp_sendmsg,
++ .sendmsg = inet_tcp_sendmsg,
+ .recvmsg = sock_common_recvmsg,
+ .mmap = sock_no_mmap,
+ .sendpage = tcp_sendpage,
+--- a/net/ipv4/tcp.c 2007-10-01 15:36:23.000000000 -0400
++++ b/net/ipv4/tcp.c 2007-10-01 15:38:17.000000000 -0400
+@@ -658,10 +658,9 @@ static inline int select_size(struct soc
+ return tmp;
+ }
+
+-int tcp_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg,
++int tcp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
+ size_t size)
+ {
+- struct sock *sk = sock->sk;
+ struct iovec *iov;
+ struct tcp_sock *tp = tcp_sk(sk);
+ struct sk_buff *skb;
diff --git a/patches.suse/kabi-safe-2.6.22.8-snd_mem b/patches.suse/kabi-safe-2.6.22.8-snd_mem
new file mode 100644
index 0000000000..bc818a9b8a
--- /dev/null
+++ b/patches.suse/kabi-safe-2.6.22.8-snd_mem
@@ -0,0 +1,71 @@
+From: Jeff Mahoney <jeffm@suse.com>
+Subject: [PATCH] kABI: rework ALSA memalloc seq_file change from 2.6.22.8
+References: None, proactive fix
+Patch-mainline: Never
+
+ This patch moves the exports and #include's to preserve the exported symbol
+ symvers. This is really just working around a stupidity in the ksym
+ calculations.
+
+Signed-off-by: Jeff Mahoney <jeffm@suse.com>
+---
+ sound/core/memalloc.c | 31 +++++++++++++++++--------------
+ 1 file changed, 17 insertions(+), 14 deletions(-)
+
+--- a/sound/core/memalloc.c 2007-10-03 10:50:09.000000000 -0400
++++ b/sound/core/memalloc.c 2007-10-03 10:53:10.000000000 -0400
+@@ -27,7 +27,6 @@
+ #include <linux/pci.h>
+ #include <linux/slab.h>
+ #include <linux/mm.h>
+-#include <linux/seq_file.h>
+ #include <asm/uaccess.h>
+ #include <linux/dma-mapping.h>
+ #include <linux/moduleparam.h>
+@@ -474,11 +474,28 @@ static void free_all_reserved_pages(void
+ mutex_unlock(&list_mutex);
+ }
+
++/*
++ * exports
++ */
++EXPORT_SYMBOL(snd_dma_alloc_pages);
++EXPORT_SYMBOL(snd_dma_alloc_pages_fallback);
++EXPORT_SYMBOL(snd_dma_free_pages);
++
++EXPORT_SYMBOL(snd_dma_get_reserved_buf);
++EXPORT_SYMBOL(snd_dma_reserve_buf);
++
++EXPORT_SYMBOL(snd_malloc_pages);
++EXPORT_SYMBOL(snd_free_pages);
+
+ #ifdef CONFIG_PROC_FS
+ /*
+ * proc file interface
+ */
++/* lmb, 2007-10-02 - reordering the include down here prevents
++ * previously opaque types from being expanded to protect the precious
++ * kABI - gross hack. */
++#include <linux/seq_file.h>
++
+ #define SND_MEM_PROC_FILE "driver/snd-page-alloc"
+ static struct proc_dir_entry *snd_mem_proc;
+
+@@ -640,17 +657,3 @@ static void __exit snd_mem_exit(void)
+
+ module_init(snd_mem_init)
+ module_exit(snd_mem_exit)
+-
+-
+-/*
+- * exports
+- */
+-EXPORT_SYMBOL(snd_dma_alloc_pages);
+-EXPORT_SYMBOL(snd_dma_alloc_pages_fallback);
+-EXPORT_SYMBOL(snd_dma_free_pages);
+-
+-EXPORT_SYMBOL(snd_dma_get_reserved_buf);
+-EXPORT_SYMBOL(snd_dma_reserve_buf);
+-
+-EXPORT_SYMBOL(snd_malloc_pages);
+-EXPORT_SYMBOL(snd_free_pages);
diff --git a/series.conf b/series.conf
index 807861b899..b4a1a606a2 100644
--- a/series.conf
+++ b/series.conf
@@ -38,6 +38,12 @@
patches.kernel.org/patch-2.6.22.8-9
########################################################
+ # kABI consistency patches
+ ########################################################
+ patches.suse/kabi-safe-2.6.22.6-tcp_sendmsg
+ patches.suse/kabi-safe-2.6.22.8-snd_mem
+
+ ########################################################
# kbuild/module infrastructure fixes
########################################################
patches.suse/error-implicit-function-declaration.patch
@@ -425,6 +431,7 @@
########################################################
patches.fixes/ipv6-no-autoconf
+
########################################################
# These patches are from the netfilter team, and
# are required to tag IPsec packets for packet