r1029 - trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches
Joshua Kwan
joshk@haydn.debian.org
Wed, 11 Aug 2004 22:04:40 -0600
Author: joshk
Date: 2004-08-11 22:04:29 -0600 (Wed, 11 Aug 2004)
New Revision: 1029
Added:
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/053_spinlock_gcc_version.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/054_skbuff_forward_decl.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/055_main_arg_handling.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/056_always_check_ECN.diff
Modified:
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/052_missing_includes.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/patch-2.4.26-1
Log:
just about the last of the bunch
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/052_missing_includes.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/052_missing_includes.diff 2004-08-12 03:58:21 UTC (rev 1028)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/052_missing_includes.diff 2004-08-12 04:04:29 UTC (rev 1029)
@@ -51,14 +51,45 @@
struct netlink_skb_parms
{
struct ucred creds; /* Skb credentials */
-diff -urN kernel-source-2.4.26/include/asm-alpha/scatterlist.h kernel-source-2.4.26-1/include/asm-alpha/scatterlist.h
---- kernel-source-2.4.26/include/asm-alpha/scatterlist.h 2001-10-13 08:35:54.000000000 +1000
-+++ kernel-source-2.4.26-1/include/asm-alpha/scatterlist.h 2004-04-17 10:10:28.000000000 +1000
-@@ -2,6 +2,7 @@
- #define _ALPHA_SCATTERLIST_H
+diff -urN kernel-source-2.4.26/include/linux/watchdog.h kernel-source-2.4.26-1/include/linux/watchdog.h
+--- kernel-source-2.4.26/include/linux/watchdog.h 2002-11-29 10:53:15.000000000 +1100
++++ kernel-source-2.4.26-1/include/linux/watchdog.h 2003-06-15 16:20:44.000000000 +1000
+@@ -10,6 +10,7 @@
+ #define _LINUX_WATCHDOG_H
- #include <asm/page.h>
+ #include <linux/ioctl.h>
+#include <linux/types.h>
-
- struct scatterlist {
- /* This will disappear in 2.5.x */
+
+ #define WATCHDOG_IOCTL_BASE 'W'
+
+diff -urN kernel-source-2.4.26/include/net/neighbour.h kernel-source-2.4.26-1/include/net/neighbour.h
+--- kernel-source-2.4.26/include/net/neighbour.h 2003-11-29 05:26:21.000000000 +1100
++++ kernel-source-2.4.26-1/include/net/neighbour.h 2003-11-29 20:53:51.000000000 +1100
+@@ -45,11 +45,15 @@
+
+ #include <asm/atomic.h>
+ #include <linux/skbuff.h>
++#include <linux/netdevice.h>
++#include <linux/interrupt.h>
+
+ #define NUD_IN_TIMER (NUD_INCOMPLETE|NUD_DELAY|NUD_PROBE)
+ #define NUD_VALID (NUD_PERMANENT|NUD_NOARP|NUD_REACHABLE|NUD_PROBE|NUD_STALE|NUD_DELAY)
+ #define NUD_CONNECTED (NUD_PERMANENT|NUD_NOARP|NUD_REACHABLE)
+
++struct neighbour;
++
+ struct neigh_parms
+ {
+ struct neigh_parms *next;
+diff -urN kernel-source-2.4.26/include/net/ip6_route.h kernel-source-2.4.26-1/include/net/ip6_route.h
+--- kernel-source-2.4.26/include/net/ip6_route.h 2003-06-14 00:51:39.000000000 +1000
++++ kernel-source-2.4.26-1/include/net/ip6_route.h 2003-08-02 17:53:39.000000000 +1000
+@@ -11,6 +11,7 @@
+
+ #include <net/flow.h>
+ #include <net/ip6_fib.h>
++#include <net/sock.h>
+
+ struct pol_chain {
+ int type;
+
Added: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/053_spinlock_gcc_version.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/053_spinlock_gcc_version.diff 2004-08-12 03:58:21 UTC (rev 1028)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/053_spinlock_gcc_version.diff 2004-08-12 04:04:29 UTC (rev 1029)
@@ -0,0 +1,30 @@
+diff -urN kernel-source-2.4.26/include/linux/spinlock.h kernel-source-2.4.26-1/include/linux/spinlock.h
+--- kernel-source-2.4.26/include/linux/spinlock.h 2004-02-19 00:36:32.000000000 +1100
++++ kernel-source-2.4.26-1/include/linux/spinlock.h 2004-02-22 20:28:34.000000000 +1100
+@@ -70,10 +70,9 @@
+ /*
+ * Your basic spinlocks, allowing only a single CPU anywhere
+ *
+- * Some older gcc versions had a nasty bug with empty initializers.
+- * (XXX: could someone please confirm whether egcs 1.1 still has this bug?)
++ * Most gcc versions have a nasty bug with empty initializers.
+ */
+-#if (__GNUC__ > 2 || __GNUC_MINOR__ > 95)
++#if (__GNUC__ > 2)
+ typedef struct { } spinlock_t;
+ #define SPIN_LOCK_UNLOCKED (spinlock_t) { }
+ #else
+@@ -134,10 +133,9 @@
+ * irq-safe write-lock, but readers can get non-irqsafe
+ * read-locks.
+ *
+- * Some older gcc versions had a nasty bug with empty initializers.
+- * (XXX: could someone please confirm whether egcs 1.1 still has this bug?)
++ * Most gcc versions have a nasty bug with empty initializers.
+ */
+-#if (__GNUC__ > 2 || __GNUC_MINOR__ > 91)
++#if (__GNUC__ > 2)
+ typedef struct { } rwlock_t;
+ #define RW_LOCK_UNLOCKED (rwlock_t) { }
+ #else
+
Added: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/054_skbuff_forward_decl.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/054_skbuff_forward_decl.diff 2004-08-12 03:58:21 UTC (rev 1028)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/054_skbuff_forward_decl.diff 2004-08-12 04:04:29 UTC (rev 1029)
@@ -0,0 +1,13 @@
+diff -urN kernel-source-2.4.26/include/linux/skbuff.h kernel-source-2.4.26-1/include/linux/skbuff.h
+--- kernel-source-2.4.26/include/linux/skbuff.h 2004-04-14 23:05:40.000000000 +1000
++++ kernel-source-2.4.26-1/include/linux/skbuff.h 2004-04-17 14:24:06.000000000 +1000
+@@ -126,6 +126,8 @@
+ skb_frag_t frags[MAX_SKB_FRAGS];
+ };
+
++struct net_device;
++
+ struct sk_buff {
+ /* These two members must be first. */
+ struct sk_buff * next; /* Next buffer in list */
+
Added: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/055_main_arg_handling.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/055_main_arg_handling.diff 2004-08-12 03:58:21 UTC (rev 1028)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/055_main_arg_handling.diff 2004-08-12 04:04:29 UTC (rev 1029)
@@ -0,0 +1,49 @@
+diff -urN kernel-source-2.4.26/init/main.c kernel-source-2.4.26-1/init/main.c
+--- kernel-source-2.4.26/init/main.c 2003-11-29 05:26:21.000000000 +1100
++++ kernel-source-2.4.26-1/init/main.c 2003-11-29 20:53:51.000000000 +1100
+@@ -235,11 +235,14 @@
+ {
+ char *next,*quote;
+ int args, envs;
++ char *peq;
++ int oenvs, i;
+
+ if (!*line)
+ return;
+ args = 0;
+ envs = 1; /* TERM is set to 'linux' by default */
++ oenvs = envs;
+ next = line;
+ while ((line = next) != NULL) {
+ quote = strchr(line,'"');
+@@ -256,6 +259,8 @@
+ }
+ if (next != NULL)
+ *next++ = 0;
++ if (!*line)
++ continue;
+ if (!strncmp(line,"init=",5)) {
+ line += 5;
+ execute_command = line;
+@@ -274,7 +279,20 @@
+ * Then check if it's an environment variable or
+ * an option.
+ */
+- if (strchr(line,'=')) {
++ if ((peq = strchr(line,'=')) != NULL) {
++ /*
++ * Make sure we don't duplicate what's in the
++ * initial environment. We don't check for
++ * duplicates in line since the user can sort
++ * that one out.
++ */
++ for (i = 0; i <= oenvs; i++)
++ if (strncmp(line,envp_init[i],peq-line) == 0) {
++ envp_init[i] = line;
++ break;
++ }
++ if (i <= oenvs)
++ continue;
+ if (envs >= MAX_INIT_ENVS)
+ break;
+ envp_init[++envs] = line;
Added: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/056_always_check_ECN.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/056_always_check_ECN.diff 2004-08-12 03:58:21 UTC (rev 1028)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/056_always_check_ECN.diff 2004-08-12 04:04:29 UTC (rev 1029)
@@ -0,0 +1,14 @@
+diff -urN kernel-source-2.4.26/net/ipv4/tcp_diag.c kernel-source-2.4.26-1/net/ipv4/tcp_diag.c
+--- kernel-source-2.4.26/net/ipv4/tcp_diag.c 2003-08-25 21:44:44.000000000 +1000
++++ kernel-source-2.4.26-1/net/ipv4/tcp_diag.c 2003-09-03 20:27:21.000000000 +1000
+@@ -155,10 +155,8 @@
+ info->tcpi_snd_wscale = 0;
+ info->tcpi_rcv_wscale = 0;
+ }
+-#ifdef CONFIG_INET_ECN
+ if (tp->ecn_flags&TCP_ECN_OK)
+ info->tcpi_options |= TCPI_OPT_ECN;
+-#endif
+
+ info->tcpi_rto = (1000000*tp->rto)/HZ;
+ info->tcpi_ato = (1000000*tp->ack.ato)/HZ;
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/patch-2.4.26-1
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/patch-2.4.26-1 2004-08-12 03:58:21 UTC (rev 1028)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/patch-2.4.26-1 2004-08-12 04:04:29 UTC (rev 1029)
@@ -1,4 +1,3 @@
-8377
--- a/Documentation/Configure.help
+++ b/Documentation/Configure.help
@@ -16485,6 +16567,43 @@
@@ -8734,58 +8733,7 @@
+}
+
+#endif /* _POSIX_ACL_XATTR_H */
-diff -urN kernel-source-2.4.26/include/linux/skbuff.h kernel-source-2.4.26-1/include/linux/skbuff.h
---- kernel-source-2.4.26/include/linux/skbuff.h 2004-04-14 23:05:40.000000000 +1000
-+++ kernel-source-2.4.26-1/include/linux/skbuff.h 2004-04-17 14:24:06.000000000 +1000
-@@ -126,6 +126,8 @@
- skb_frag_t frags[MAX_SKB_FRAGS];
- };
-
-+struct net_device;
-+
- struct sk_buff {
- /* These two members must be first. */
- struct sk_buff * next; /* Next buffer in list */
-diff -urN kernel-source-2.4.26/include/linux/spinlock.h kernel-source-2.4.26-1/include/linux/spinlock.h
---- kernel-source-2.4.26/include/linux/spinlock.h 2004-02-19 00:36:32.000000000 +1100
-+++ kernel-source-2.4.26-1/include/linux/spinlock.h 2004-02-22 20:28:34.000000000 +1100
-@@ -70,10 +70,9 @@
- /*
- * Your basic spinlocks, allowing only a single CPU anywhere
- *
-- * Some older gcc versions had a nasty bug with empty initializers.
-- * (XXX: could someone please confirm whether egcs 1.1 still has this bug?)
-+ * Most gcc versions have a nasty bug with empty initializers.
- */
--#if (__GNUC__ > 2 || __GNUC_MINOR__ > 95)
-+#if (__GNUC__ > 2)
- typedef struct { } spinlock_t;
- #define SPIN_LOCK_UNLOCKED (spinlock_t) { }
- #else
-@@ -134,10 +133,9 @@
- * irq-safe write-lock, but readers can get non-irqsafe
- * read-locks.
- *
-- * Some older gcc versions had a nasty bug with empty initializers.
-- * (XXX: could someone please confirm whether egcs 1.1 still has this bug?)
-+ * Most gcc versions have a nasty bug with empty initializers.
- */
--#if (__GNUC__ > 2 || __GNUC_MINOR__ > 91)
-+#if (__GNUC__ > 2)
- typedef struct { } rwlock_t;
- #define RW_LOCK_UNLOCKED (rwlock_t) { }
- #else
-diff -urN kernel-source-2.4.26/include/linux/watchdog.h kernel-source-2.4.26-1/include/linux/watchdog.h
---- kernel-source-2.4.26/include/linux/watchdog.h 2002-11-29 10:53:15.000000000 +1100
-+++ kernel-source-2.4.26-1/include/linux/watchdog.h 2003-06-15 16:20:44.000000000 +1000
-@@ -10,6 +10,7 @@
- #define _LINUX_WATCHDOG_H
-
- #include <linux/ioctl.h>
-+#include <linux/types.h>
-
- #define WATCHDOG_IOCTL_BASE 'W'
-
+
diff -urN kernel-source-2.4.26/include/linux/xattr_acl.h kernel-source-2.4.26-1/include/linux/xattr_acl.h
--- kernel-source-2.4.26/include/linux/xattr_acl.h 1970-01-01 10:00:00.000000000 +1000
+++ kernel-source-2.4.26-1/include/linux/xattr_acl.h 2004-02-22 19:42:21.000000000 +1100
@@ -8840,47 +8788,7 @@
+
+
+#endif /* _LINUX_XATTR_ACL_H */
-diff -urN kernel-source-2.4.26/include/net/ip6_route.h kernel-source-2.4.26-1/include/net/ip6_route.h
---- kernel-source-2.4.26/include/net/ip6_route.h 2003-06-14 00:51:39.000000000 +1000
-+++ kernel-source-2.4.26-1/include/net/ip6_route.h 2003-08-02 17:53:39.000000000 +1000
-@@ -11,6 +11,7 @@
-
- #include <net/flow.h>
- #include <net/ip6_fib.h>
-+#include <net/sock.h>
-
- struct pol_chain {
- int type;
-diff -urN kernel-source-2.4.26/include/net/neighbour.h kernel-source-2.4.26-1/include/net/neighbour.h
---- kernel-source-2.4.26/include/net/neighbour.h 2003-11-29 05:26:21.000000000 +1100
-+++ kernel-source-2.4.26-1/include/net/neighbour.h 2003-11-29 20:53:51.000000000 +1100
-@@ -45,11 +45,15 @@
-
- #include <asm/atomic.h>
- #include <linux/skbuff.h>
-+#include <linux/netdevice.h>
-+#include <linux/interrupt.h>
-
- #define NUD_IN_TIMER (NUD_INCOMPLETE|NUD_DELAY|NUD_PROBE)
- #define NUD_VALID (NUD_PERMANENT|NUD_NOARP|NUD_REACHABLE|NUD_PROBE|NUD_STALE|NUD_DELAY)
- #define NUD_CONNECTED (NUD_PERMANENT|NUD_NOARP|NUD_REACHABLE)
-
-+struct neighbour;
-+
- struct neigh_parms
- {
- struct neigh_parms *next;
-diff -urN kernel-source-2.4.26/include/net/route.h kernel-source-2.4.26-1/include/net/route.h
---- kernel-source-2.4.26/include/net/route.h 2003-08-25 21:44:44.000000000 +1000
-+++ kernel-source-2.4.26-1/include/net/route.h 2004-04-17 10:10:28.000000000 +1000
-@@ -27,6 +27,7 @@
- #include <linux/config.h>
- #include <net/dst.h>
- #include <net/inetpeer.h>
-+#include <net/flow.h>
- #include <linux/in_route.h>
- #include <linux/rtnetlink.h>
- #include <linux/route.h>
+
diff -urN kernel-source-2.4.26/init/do_mounts.c kernel-source-2.4.26-1/init/do_mounts.c
--- kernel-source-2.4.26/init/do_mounts.c 2003-11-29 05:26:21.000000000 +1100
+++ kernel-source-2.4.26-1/init/do_mounts.c 2003-11-29 20:53:51.000000000 +1100
@@ -8907,55 +8815,7 @@
}
read(in_fd, buf, BLOCK_SIZE);
write(out_fd, buf, BLOCK_SIZE);
-diff -urN kernel-source-2.4.26/init/main.c kernel-source-2.4.26-1/init/main.c
---- kernel-source-2.4.26/init/main.c 2003-11-29 05:26:21.000000000 +1100
-+++ kernel-source-2.4.26-1/init/main.c 2003-11-29 20:53:51.000000000 +1100
-@@ -235,11 +235,14 @@
- {
- char *next,*quote;
- int args, envs;
-+ char *peq;
-+ int oenvs, i;
-
- if (!*line)
- return;
- args = 0;
- envs = 1; /* TERM is set to 'linux' by default */
-+ oenvs = envs;
- next = line;
- while ((line = next) != NULL) {
- quote = strchr(line,'"');
-@@ -256,6 +259,8 @@
- }
- if (next != NULL)
- *next++ = 0;
-+ if (!*line)
-+ continue;
- if (!strncmp(line,"init=",5)) {
- line += 5;
- execute_command = line;
-@@ -274,7 +279,20 @@
- * Then check if it's an environment variable or
- * an option.
- */
-- if (strchr(line,'=')) {
-+ if ((peq = strchr(line,'=')) != NULL) {
-+ /*
-+ * Make sure we don't duplicate what's in the
-+ * initial environment. We don't check for
-+ * duplicates in line since the user can sort
-+ * that one out.
-+ */
-+ for (i = 0; i <= oenvs; i++)
-+ if (strncmp(line,envp_init[i],peq-line) == 0) {
-+ envp_init[i] = line;
-+ break;
-+ }
-+ if (i <= oenvs)
-+ continue;
- if (envs >= MAX_INIT_ENVS)
- break;
- envp_init[++envs] = line;
+
diff -urN kernel-source-2.4.26/kernel/Makefile kernel-source-2.4.26-1/kernel/Makefile
--- kernel-source-2.4.26/kernel/Makefile 2001-09-17 14:22:40.000000000 +1000
+++ kernel-source-2.4.26-1/kernel/Makefile 2004-04-17 13:32:34.000000000 +1000
@@ -9069,62 +8929,4 @@
if (!*failed_swapout)
*failed_swapout = !swap_out(classzone);
-diff -urN kernel-source-2.4.26/net/ipv4/tcp_diag.c kernel-source-2.4.26-1/net/ipv4/tcp_diag.c
---- kernel-source-2.4.26/net/ipv4/tcp_diag.c 2003-08-25 21:44:44.000000000 +1000
-+++ kernel-source-2.4.26-1/net/ipv4/tcp_diag.c 2003-09-03 20:27:21.000000000 +1000
-@@ -155,10 +155,8 @@
- info->tcpi_snd_wscale = 0;
- info->tcpi_rcv_wscale = 0;
- }
--#ifdef CONFIG_INET_ECN
- if (tp->ecn_flags&TCP_ECN_OK)
- info->tcpi_options |= TCPI_OPT_ECN;
--#endif
-
- info->tcpi_rto = (1000000*tp->rto)/HZ;
- info->tcpi_ato = (1000000*tp->ack.ato)/HZ;
-diff -urN kernel-source-2.4.26/net/netlink/af_netlink.c kernel-source-2.4.26-1/net/netlink/af_netlink.c
---- kernel-source-2.4.26/net/netlink/af_netlink.c 2004-02-19 00:36:32.000000000 +1100
-+++ kernel-source-2.4.26-1/net/netlink/af_netlink.c 2004-04-17 10:10:28.000000000 +1000
-@@ -496,13 +496,13 @@
- return -1;
- }
-
--void netlink_broadcast(struct sock *ssk, struct sk_buff *skb, u32 pid,
-- u32 group, int allocation)
-+int netlink_broadcast(struct sock *ssk, struct sk_buff *skb, u32 pid,
-+ u32 group, int allocation)
- {
- struct sock *sk;
- struct sk_buff *skb2 = NULL;
- int protocol = ssk->protocol;
-- int failure = 0;
-+ int failure = 0, delivered = 0;
-
- /* While we sleep in clone, do not allow to change socket list */
-
-@@ -536,8 +536,10 @@
- failure = 1;
- } else if (netlink_broadcast_deliver(sk, skb2)) {
- netlink_overrun(sk);
-- } else
-+ } else {
-+ delivered = 1;
- skb2 = NULL;
-+ }
- sock_put(sk);
- }
-
-@@ -546,6 +548,12 @@
- if (skb2)
- kfree_skb(skb2);
- kfree_skb(skb);
-+
-+ if (delivered)
-+ return 0;
-+ if (failure)
-+ return -ENOBUFS;
-+ return -ESRCH;
- }
-
- void netlink_set_err(struct sock *ssk, u32 pid, u32 group, int code)
+