Author: pluto Date: Mon Sep 8 11:12:15 2008 GMT
Module: SOURCES Tag: LINUX_2_6
---- Log message:
- updated.
---- Files affected:
SOURCES:
kernel-tproxy.patch (1.1.2.1 -> 1.1.2.2) , linux-2.6-vs2.3.patch
(1.2.4.11.2.38 -> 1.2.4.11.2.39)
---- Diffs:
================================================================
Index: SOURCES/kernel-tproxy.patch
diff -u SOURCES/kernel-tproxy.patch:1.1.2.1 SOURCES/kernel-tproxy.patch:1.1.2.2
--- SOURCES/kernel-tproxy.patch:1.1.2.1 Wed May 14 19:29:37 2008
+++ SOURCES/kernel-tproxy.patch Mon Sep 8 13:12:08 2008
@@ -264,19 +264,19 @@
#include <net/flow.h>
-#include <net/sock.h>
+#include <net/inet_sock.h>
+ // #include <linux/in.h>
#include <linux/in_route.h>
#include <linux/rtnetlink.h>
- #include <linux/route.h>
-@@ -161,6 +161,9 @@ static inline int ip_route_connect(struct rtable **rp,
__be32 dst,
- int err;
+@@ -175,6 +175,9 @@
struct net *net = sock_net(sk);
struct nx_info *nx_info = current->nx_info;
-+
+
+ if (inet_sk(sk)->transparent)
+ fl.flags |= FLOWI_FLAG_ANYSRC;
-
++
if (sk)
nx_info = sk->sk_nx_info;
+
--
1.5.2.5
@@ -720,15 +720,15 @@
/* (C) 1999-2001 Paul `Rusty' Russell
* (C) 2002-2004 Netfilter Core Team <[EMAIL PROTECTED]>
*
-@@ -24,6 +25,7 @@
+@@ -23,6 +24,7 @@
#include <net/netfilter/nf_conntrack_l3proto.h>
#include <net/netfilter/nf_conntrack_core.h>
#include <net/netfilter/ipv4/nf_conntrack_ipv4.h>
+#include <net/netfilter/ipv4/nf_defrag_ipv4.h>
+ #include <net/netfilter/nf_nat_helper.h>
int (*nf_nat_seq_adjust_hook)(struct sk_buff *skb,
- struct nf_conn *ct,
-@@ -63,23 +65,6 @@ static int ipv4_print_tuple(struct seq_file *s,
+@@ -63,23 +65,6 @@
NIPQUAD(tuple->dst.u3.ip));
}
@@ -752,7 +752,7 @@
static int ipv4_get_l4proto(const struct sk_buff *skb, unsigned int nhoff,
unsigned int *dataoff, u_int8_t *protonum)
{
-@@ -144,28 +129,6 @@ out:
+@@ -144,28 +129,6 @@
return nf_conntrack_confirm(skb);
}
@@ -781,7 +781,7 @@
static unsigned int ipv4_conntrack_in(unsigned int hooknum,
struct sk_buff *skb,
const struct net_device *in,
-@@ -195,13 +158,6 @@ static unsigned int ipv4_conntrack_local(unsigned int
hooknum,
+@@ -195,13 +158,6 @@
make it the first hook. */
static struct nf_hook_ops ipv4_conntrack_ops[] __read_mostly = {
{
@@ -795,7 +795,7 @@
.hook = ipv4_conntrack_in,
.owner = THIS_MODULE,
.pf = PF_INET,
-@@ -209,13 +165,6 @@ static struct nf_hook_ops ipv4_conntrack_ops[]
__read_mostly = {
+@@ -209,13 +165,6 @@
.priority = NF_IP_PRI_CONNTRACK,
},
{
@@ -809,7 +809,7 @@
.hook = ipv4_conntrack_local,
.owner = THIS_MODULE,
.pf = PF_INET,
-@@ -422,6 +371,7 @@ static int __init nf_conntrack_l3proto_ipv4_init(void)
+@@ -422,6 +371,7 @@
int ret = 0;
need_conntrack();
@@ -1531,7 +1531,7 @@
index 58873ad..8937675 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
-@@ -1647,8 +1647,17 @@ int tcp_v4_rcv(struct sk_buff *skb)
+@@ -1643,6 +1643,15 @@
TCP_SKB_CB(skb)->flags = iph->tos;
TCP_SKB_CB(skb)->sacked = 0;
@@ -1543,12 +1543,10 @@
+ skb->sk = NULL;
+ } else
+#endif
- sk = __inet_lookup(skb->dev->nd_net, &tcp_hashinfo, iph->saddr,
- th->source, iph->daddr, th->dest, inet_iif(skb));
+
+ sk = __inet_lookup(dev_net(skb->dev), &tcp_hashinfo, iph->saddr,
+ th->source, iph->daddr, th->dest, inet_iif(skb));
if (!sk)
- goto no_tcp_socket;
-
--
1.5.2.5
@@ -1568,7 +1566,7 @@
index 672d0d4..c29597c 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
-@@ -364,6 +364,14 @@ void __udp4_lib_err(struct sk_buff *skb, u32 info, struct
hlist_head udptable[])
+@@ -365,6 +365,14 @@
int harderr;
int err;
@@ -1580,10 +1578,10 @@
+ skb->sk = NULL;
+ } else
+#endif
- sk = __udp4_lib_lookup(skb->dev->nd_net, iph->daddr, uh->dest,
+ sk = __udp4_lib_lookup(dev_net(skb->dev), iph->daddr, uh->dest,
iph->saddr, uh->source, skb->dev->ifindex, udptable);
if (sk == NULL) {
-@@ -1188,6 +1196,14 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct
hlist_head udptable[],
+@@ -1199,6 +1207,14 @@
if (rt->rt_flags & (RTCF_BROADCAST|RTCF_MULTICAST))
return __udp4_lib_mcast_deliver(skb, uh, saddr, daddr,
udptable);
@@ -1595,7 +1593,7 @@
+ skb->sk = NULL;
+ } else
+#endif
- sk = __udp4_lib_lookup(skb->dev->nd_net, saddr, uh->source, daddr,
+ sk = __udp4_lib_lookup(dev_net(skb->dev), saddr, uh->source, daddr,
uh->dest, inet_iif(skb), udptable);
--
================================================================
Index: SOURCES/linux-2.6-vs2.3.patch
diff -u SOURCES/linux-2.6-vs2.3.patch:1.2.4.11.2.38
SOURCES/linux-2.6-vs2.3.patch:1.2.4.11.2.39
--- SOURCES/linux-2.6-vs2.3.patch:1.2.4.11.2.38 Mon Jul 14 12:25:59 2008
+++ SOURCES/linux-2.6-vs2.3.patch Mon Sep 8 13:12:08 2008
@@ -1,6 +1,6 @@
-diff -NurpP --minimal linux-2.6.25.4/arch/alpha/Kconfig
linux-2.6.25.4-vs2.3.0.34.10/arch/alpha/Kconfig
---- linux-2.6.25.4/arch/alpha/Kconfig 2008-04-17 12:05:26.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/alpha/Kconfig 2008-04-19
15:14:51.000000000 -0400
+diff -NurpP --minimal linux-2.6.26.3/arch/alpha/Kconfig
linux-2.6.26.3-vs2.3.0.35.5/arch/alpha/Kconfig
+--- linux-2.6.26.3/arch/alpha/Kconfig 2008-07-13 23:51:29.000000000 +0200
++++ linux-2.6.26.3-vs2.3.0.35.5/arch/alpha/Kconfig 2008-09-05
20:06:14.000000000 +0200
@@ -671,6 +671,8 @@ config DUMMY_CONSOLE
depends on VGA_HOSE
default y
@@ -10,9 +10,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.25.4/arch/alpha/kernel/entry.S
linux-2.6.25.4-vs2.3.0.34.10/arch/alpha/kernel/entry.S
---- linux-2.6.25.4/arch/alpha/kernel/entry.S 2008-04-17 11:31:21.000000000
-0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/alpha/kernel/entry.S 2008-04-21
11:09:01.000000000 -0400
+diff -NurpP --minimal linux-2.6.26.3/arch/alpha/kernel/entry.S
linux-2.6.26.3-vs2.3.0.35.5/arch/alpha/kernel/entry.S
+--- linux-2.6.26.3/arch/alpha/kernel/entry.S 2008-07-13 23:51:29.000000000
+0200
++++ linux-2.6.26.3-vs2.3.0.35.5/arch/alpha/kernel/entry.S 2008-09-05
20:06:14.000000000 +0200
@@ -872,24 +872,15 @@ sys_getxgid:
.globl sys_getxpid
.ent sys_getxpid
@@ -45,9 +45,9 @@
ret
.end sys_getxpid
-diff -NurpP --minimal linux-2.6.25.4/arch/alpha/kernel/osf_sys.c
linux-2.6.25.4-vs2.3.0.34.10/arch/alpha/kernel/osf_sys.c
---- linux-2.6.25.4/arch/alpha/kernel/osf_sys.c 2008-05-21 14:30:05.000000000
-0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/alpha/kernel/osf_sys.c 2008-05-21
14:30:40.000000000 -0400
+diff -NurpP --minimal linux-2.6.26.3/arch/alpha/kernel/osf_sys.c
linux-2.6.26.3-vs2.3.0.35.5/arch/alpha/kernel/osf_sys.c
+--- linux-2.6.26.3/arch/alpha/kernel/osf_sys.c 2008-07-13 23:51:29.000000000
+0200
++++ linux-2.6.26.3-vs2.3.0.35.5/arch/alpha/kernel/osf_sys.c 2008-09-05
20:06:14.000000000 +0200
@@ -883,7 +883,7 @@ osf_gettimeofday(struct timeval32 __user
{
if (tv) {
@@ -57,9 +57,9 @@
if (put_tv32(tv, &ktv))
return -EFAULT;
}
-diff -NurpP --minimal linux-2.6.25.4/arch/alpha/kernel/ptrace.c
linux-2.6.25.4-vs2.3.0.34.10/arch/alpha/kernel/ptrace.c
---- linux-2.6.25.4/arch/alpha/kernel/ptrace.c 2008-04-17 11:31:21.000000000
-0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/alpha/kernel/ptrace.c 2008-04-19
15:14:51.000000000 -0400
+diff -NurpP --minimal linux-2.6.26.3/arch/alpha/kernel/ptrace.c
linux-2.6.26.3-vs2.3.0.35.5/arch/alpha/kernel/ptrace.c
+--- linux-2.6.26.3/arch/alpha/kernel/ptrace.c 2008-07-13 23:51:29.000000000
+0200
++++ linux-2.6.26.3-vs2.3.0.35.5/arch/alpha/kernel/ptrace.c 2008-09-05
20:06:14.000000000 +0200
@@ -15,6 +15,7 @@
#include <linux/slab.h>
#include <linux/security.h>
@@ -68,45 +68,9 @@
#include <asm/uaccess.h>
#include <asm/pgtable.h>
-diff -NurpP --minimal linux-2.6.25.4/arch/alpha/kernel/semaphore.c
linux-2.6.25.4-vs2.3.0.34.10/arch/alpha/kernel/semaphore.c
---- linux-2.6.25.4/arch/alpha/kernel/semaphore.c 2008-04-17
11:31:21.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/alpha/kernel/semaphore.c 2008-04-19
15:14:51.000000000 -0400
-@@ -68,8 +68,8 @@ __down_failed(struct semaphore *sem)
- DECLARE_WAITQUEUE(wait, tsk);
-
- #ifdef CONFIG_DEBUG_SEMAPHORE
-- printk("%s(%d): down failed(%p)\n",
-- tsk->comm, task_pid_nr(tsk), sem);
-+ printk("%s(%d:#%u): down failed(%p)\n",
-+ tsk->comm, task_pid_nr(tsk), tsk->xid, sem);
- #endif
-
- tsk->state = TASK_UNINTERRUPTIBLE;
-@@ -97,8 +97,8 @@ __down_failed(struct semaphore *sem)
- wake_up(&sem->wait);
-
- #ifdef CONFIG_DEBUG_SEMAPHORE
-- printk("%s(%d): down acquired(%p)\n",
-- tsk->comm, task_pid_nr(tsk), sem);
-+ printk("%s(%d:#%u): down acquired(%p)\n",
-+ tsk->comm, task_pid_nr(tsk), tsk->xid, sem);
- #endif
- }
-
-@@ -110,8 +110,8 @@ __down_failed_interruptible(struct semap
- long ret = 0;
-
- #ifdef CONFIG_DEBUG_SEMAPHORE
-- printk("%s(%d): down failed(%p)\n",
-- tsk->comm, task_pid_nr(tsk), sem);
-+ printk("%s(%d:#%u): down failed(%p)\n",
-+ tsk->comm, task_pid_nr(tsk), tsk->xid, sem);
- #endif
-
- tsk->state = TASK_INTERRUPTIBLE;
-diff -NurpP --minimal linux-2.6.25.4/arch/alpha/kernel/systbls.S
linux-2.6.25.4-vs2.3.0.34.10/arch/alpha/kernel/systbls.S
---- linux-2.6.25.4/arch/alpha/kernel/systbls.S 2008-04-17 12:05:26.000000000
-0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/alpha/kernel/systbls.S 2008-04-19
15:14:51.000000000 -0400
+diff -NurpP --minimal linux-2.6.26.3/arch/alpha/kernel/systbls.S
linux-2.6.26.3-vs2.3.0.35.5/arch/alpha/kernel/systbls.S
+--- linux-2.6.26.3/arch/alpha/kernel/systbls.S 2008-07-13 23:51:29.000000000
+0200
++++ linux-2.6.26.3-vs2.3.0.35.5/arch/alpha/kernel/systbls.S 2008-09-05
20:06:14.000000000 +0200
@@ -446,7 +446,7 @@ sys_call_table:
.quad sys_stat64 /* 425 */
.quad sys_lstat64
@@ -116,10 +80,10 @@
.quad sys_ni_syscall /* sys_mbind */
.quad sys_ni_syscall /* sys_get_mempolicy */
.quad sys_ni_syscall /* sys_set_mempolicy */
-diff -NurpP --minimal linux-2.6.25.4/arch/alpha/kernel/traps.c
linux-2.6.25.4-vs2.3.0.34.10/arch/alpha/kernel/traps.c
---- linux-2.6.25.4/arch/alpha/kernel/traps.c 2008-04-17 11:31:21.000000000
-0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/alpha/kernel/traps.c 2008-04-19
15:14:51.000000000 -0400
-@@ -182,7 +182,8 @@ die_if_kernel(char * str, struct pt_regs
+diff -NurpP --minimal linux-2.6.26.3/arch/alpha/kernel/traps.c
linux-2.6.26.3-vs2.3.0.35.5/arch/alpha/kernel/traps.c
+--- linux-2.6.26.3/arch/alpha/kernel/traps.c 2008-07-13 23:51:29.000000000
+0200
++++ linux-2.6.26.3-vs2.3.0.35.5/arch/alpha/kernel/traps.c 2008-09-05
20:06:14.000000000 +0200
+@@ -183,7 +183,8 @@ die_if_kernel(char * str, struct pt_regs
#ifdef CONFIG_SMP
printk("CPU %d ", hard_smp_processor_id());
#endif
@@ -129,9 +93,9 @@
dik_show_regs(regs, r9_15);
add_taint(TAINT_DIE);
dik_show_trace((unsigned long *)(regs+1));
-diff -NurpP --minimal linux-2.6.25.4/arch/alpha/mm/fault.c
linux-2.6.25.4-vs2.3.0.34.10/arch/alpha/mm/fault.c
---- linux-2.6.25.4/arch/alpha/mm/fault.c 2008-04-17 11:31:21.000000000
-0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/alpha/mm/fault.c 2008-04-19
15:14:51.000000000 -0400
+diff -NurpP --minimal linux-2.6.26.3/arch/alpha/mm/fault.c
linux-2.6.26.3-vs2.3.0.35.5/arch/alpha/mm/fault.c
+--- linux-2.6.26.3/arch/alpha/mm/fault.c 2008-07-13 23:51:29.000000000
+0200
++++ linux-2.6.26.3-vs2.3.0.35.5/arch/alpha/mm/fault.c 2008-09-05
20:06:14.000000000 +0200
@@ -193,8 +193,8 @@ do_page_fault(unsigned long address, uns
down_read(&mm->mmap_sem);
goto survive;
@@ -143,10 +107,10 @@
if (!user_mode(regs))
goto no_context;
do_group_exit(SIGKILL);
-diff -NurpP --minimal linux-2.6.25.4/arch/arm/Kconfig
linux-2.6.25.4-vs2.3.0.34.10/arch/arm/Kconfig
---- linux-2.6.25.4/arch/arm/Kconfig 2008-04-17 12:05:26.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/arm/Kconfig 2008-04-19
15:14:51.000000000 -0400
-@@ -1180,6 +1180,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-2.6.26.3/arch/arm/Kconfig
linux-2.6.26.3-vs2.3.0.35.5/arch/arm/Kconfig
+--- linux-2.6.26.3/arch/arm/Kconfig 2008-07-13 23:51:29.000000000 +0200
++++ linux-2.6.26.3-vs2.3.0.35.5/arch/arm/Kconfig 2008-09-05
20:06:15.000000000 +0200
+@@ -1187,6 +1187,8 @@ source "fs/Kconfig"
source "arch/arm/Kconfig.debug"
@@ -155,9 +119,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.25.4/arch/arm/kernel/calls.S
linux-2.6.25.4-vs2.3.0.34.10/arch/arm/kernel/calls.S
---- linux-2.6.25.4/arch/arm/kernel/calls.S 2008-04-17 12:05:26.000000000
-0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/arm/kernel/calls.S 2008-04-19
15:14:51.000000000 -0400
+diff -NurpP --minimal linux-2.6.26.3/arch/arm/kernel/calls.S
linux-2.6.26.3-vs2.3.0.35.5/arch/arm/kernel/calls.S
+--- linux-2.6.26.3/arch/arm/kernel/calls.S 2008-07-13 23:51:29.000000000
+0200
++++ linux-2.6.26.3-vs2.3.0.35.5/arch/arm/kernel/calls.S 2008-09-05
20:06:15.000000000 +0200
@@ -322,7 +322,7 @@
/* 310 */ CALL(sys_request_key)
CALL(sys_keyctl)
@@ -167,9 +131,9 @@
CALL(sys_ioprio_set)
/* 315 */ CALL(sys_ioprio_get)
CALL(sys_inotify_init)
-diff -NurpP --minimal linux-2.6.25.4/arch/arm/kernel/process.c
linux-2.6.25.4-vs2.3.0.34.10/arch/arm/kernel/process.c
---- linux-2.6.25.4/arch/arm/kernel/process.c 2008-04-17 12:05:26.000000000
-0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/arm/kernel/process.c 2008-04-21
11:09:01.000000000 -0400
+diff -NurpP --minimal linux-2.6.26.3/arch/arm/kernel/process.c
linux-2.6.26.3-vs2.3.0.35.5/arch/arm/kernel/process.c
+--- linux-2.6.26.3/arch/arm/kernel/process.c 2008-07-13 23:51:29.000000000
+0200
++++ linux-2.6.26.3-vs2.3.0.35.5/arch/arm/kernel/process.c 2008-09-05
20:06:15.000000000 +0200
@@ -264,7 +264,8 @@ void __show_regs(struct pt_regs *regs)
void show_regs(struct pt_regs * regs)
{
@@ -180,9 +144,9 @@
__show_regs(regs);
__backtrace();
}
-diff -NurpP --minimal linux-2.6.25.4/arch/arm/kernel/traps.c
linux-2.6.25.4-vs2.3.0.34.10/arch/arm/kernel/traps.c
---- linux-2.6.25.4/arch/arm/kernel/traps.c 2008-04-17 12:05:26.000000000
-0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/arm/kernel/traps.c 2008-04-19
15:14:51.000000000 -0400
+diff -NurpP --minimal linux-2.6.26.3/arch/arm/kernel/traps.c
linux-2.6.26.3-vs2.3.0.35.5/arch/arm/kernel/traps.c
+--- linux-2.6.26.3/arch/arm/kernel/traps.c 2008-07-13 23:51:29.000000000
+0200
++++ linux-2.6.26.3-vs2.3.0.35.5/arch/arm/kernel/traps.c 2008-09-05
20:06:15.000000000 +0200
@@ -214,8 +214,8 @@ static void __die(const char *str, int e
str, err, ++die_counter);
print_modules();
@@ -194,9 +158,9 @@
if (!user_mode(regs) || in_interrupt()) {
dump_mem("Stack: ", regs->ARM_sp,
-diff -NurpP --minimal linux-2.6.25.4/arch/arm/mm/fault.c
linux-2.6.25.4-vs2.3.0.34.10/arch/arm/mm/fault.c
---- linux-2.6.25.4/arch/arm/mm/fault.c 2008-04-17 12:05:27.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/arm/mm/fault.c 2008-04-19
15:14:51.000000000 -0400
+diff -NurpP --minimal linux-2.6.26.3/arch/arm/mm/fault.c
linux-2.6.26.3-vs2.3.0.35.5/arch/arm/mm/fault.c
+--- linux-2.6.26.3/arch/arm/mm/fault.c 2008-07-13 23:51:29.000000000 +0200
++++ linux-2.6.26.3-vs2.3.0.35.5/arch/arm/mm/fault.c 2008-09-05
20:06:15.000000000 +0200
@@ -292,7 +292,8 @@ do_page_fault(unsigned long addr, unsign
* happened to us that made us unable to handle
* the page fault gracefully.
@@ -207,9 +171,9 @@
do_group_exit(SIGKILL);
return 0;
}
-diff -NurpP --minimal linux-2.6.25.4/arch/cris/Kconfig
linux-2.6.25.4-vs2.3.0.34.10/arch/cris/Kconfig
---- linux-2.6.25.4/arch/cris/Kconfig 2008-04-17 12:05:27.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/cris/Kconfig 2008-04-19
15:14:51.000000000 -0400
+diff -NurpP --minimal linux-2.6.26.3/arch/cris/Kconfig
linux-2.6.26.3-vs2.3.0.35.5/arch/cris/Kconfig
+--- linux-2.6.26.3/arch/cris/Kconfig 2008-07-13 23:51:29.000000000 +0200
++++ linux-2.6.26.3-vs2.3.0.35.5/arch/cris/Kconfig 2008-09-05
20:06:15.000000000 +0200
@@ -679,6 +679,8 @@ source "drivers/usb/Kconfig"
source "arch/cris/Kconfig.debug"
@@ -219,9 +183,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.25.4/arch/frv/kernel/kernel_thread.S
linux-2.6.25.4-vs2.3.0.34.10/arch/frv/kernel/kernel_thread.S
---- linux-2.6.25.4/arch/frv/kernel/kernel_thread.S 2007-02-04
13:44:54.000000000 -0500
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/frv/kernel/kernel_thread.S
2008-04-21 11:09:01.000000000 -0400
+diff -NurpP --minimal linux-2.6.26.3/arch/frv/kernel/kernel_thread.S
linux-2.6.26.3-vs2.3.0.35.5/arch/frv/kernel/kernel_thread.S
+--- linux-2.6.26.3/arch/frv/kernel/kernel_thread.S 2008-07-13
23:51:29.000000000 +0200
++++ linux-2.6.26.3-vs2.3.0.35.5/arch/frv/kernel/kernel_thread.S
2008-09-05 20:06:15.000000000 +0200
@@ -37,7 +37,7 @@ kernel_thread:
# start by forking the current process, but with shared VM
@@ -231,9 +195,9 @@
sethi.p #0xe4e4,gr9 ; second syscall arg [newsp]
setlo #0xe4e4,gr9
setlos.p #0,gr10 ; third syscall arg
[parent_tidptr]
-diff -NurpP --minimal linux-2.6.25.4/arch/h8300/Kconfig
linux-2.6.25.4-vs2.3.0.34.10/arch/h8300/Kconfig
---- linux-2.6.25.4/arch/h8300/Kconfig 2008-04-17 12:05:28.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/h8300/Kconfig 2008-04-19
15:14:51.000000000 -0400
+diff -NurpP --minimal linux-2.6.26.3/arch/h8300/Kconfig
linux-2.6.26.3-vs2.3.0.35.5/arch/h8300/Kconfig
+--- linux-2.6.26.3/arch/h8300/Kconfig 2008-07-13 23:51:29.000000000 +0200
++++ linux-2.6.26.3-vs2.3.0.35.5/arch/h8300/Kconfig 2008-09-05
20:06:15.000000000 +0200
@@ -233,6 +233,8 @@ source "fs/Kconfig"
source "arch/h8300/Kconfig.debug"
@@ -243,9 +207,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.25.4/arch/ia64/ia32/ia32_entry.S
linux-2.6.25.4-vs2.3.0.34.10/arch/ia64/ia32/ia32_entry.S
---- linux-2.6.25.4/arch/ia64/ia32/ia32_entry.S 2008-04-17 10:37:14.000000000
-0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/ia64/ia32/ia32_entry.S 2008-04-19
15:14:51.000000000 -0400
+diff -NurpP --minimal linux-2.6.26.3/arch/ia64/ia32/ia32_entry.S
linux-2.6.26.3-vs2.3.0.35.5/arch/ia64/ia32/ia32_entry.S
+--- linux-2.6.26.3/arch/ia64/ia32/ia32_entry.S 2008-07-13 23:51:29.000000000
+0200
++++ linux-2.6.26.3-vs2.3.0.35.5/arch/ia64/ia32/ia32_entry.S 2008-09-05
20:06:15.000000000 +0200
@@ -446,7 +446,7 @@ ia32_syscall_table:
data8 sys_tgkill /* 270 */
data8 compat_sys_utimes
@@ -255,10 +219,10 @@
data8 sys_ni_syscall
data8 sys_ni_syscall /* 275 */
data8 sys_ni_syscall
-diff -NurpP --minimal linux-2.6.25.4/arch/ia64/ia32/sys_ia32.c
linux-2.6.25.4-vs2.3.0.34.10/arch/ia64/ia32/sys_ia32.c
---- linux-2.6.25.4/arch/ia64/ia32/sys_ia32.c 2008-04-17 12:05:28.000000000
-0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/ia64/ia32/sys_ia32.c 2008-04-19
15:14:51.000000000 -0400
-@@ -1177,7 +1177,7 @@ sys32_gettimeofday (struct compat_timeva
+diff -NurpP --minimal linux-2.6.26.3/arch/ia64/ia32/sys_ia32.c
linux-2.6.26.3-vs2.3.0.35.5/arch/ia64/ia32/sys_ia32.c
+--- linux-2.6.26.3/arch/ia64/ia32/sys_ia32.c 2008-07-13 23:51:29.000000000
+0200
++++ linux-2.6.26.3-vs2.3.0.35.5/arch/ia64/ia32/sys_ia32.c 2008-09-05
20:06:15.000000000 +0200
+@@ -1178,7 +1178,7 @@ sys32_gettimeofday (struct compat_timeva
{
if (tv) {
struct timeval ktv;
@@ -267,10 +231,10 @@
if (put_tv32(tv, &ktv))
return -EFAULT;
}
-diff -NurpP --minimal linux-2.6.25.4/arch/ia64/Kconfig
linux-2.6.25.4-vs2.3.0.34.10/arch/ia64/Kconfig
---- linux-2.6.25.4/arch/ia64/Kconfig 2008-04-17 12:05:28.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/ia64/Kconfig 2008-04-19
15:14:51.000000000 -0400
-@@ -615,6 +615,8 @@ source "arch/ia64/hp/sim/Kconfig"
+diff -NurpP --minimal linux-2.6.26.3/arch/ia64/Kconfig
linux-2.6.26.3-vs2.3.0.35.5/arch/ia64/Kconfig
+--- linux-2.6.26.3/arch/ia64/Kconfig 2008-07-13 23:51:29.000000000 +0200
++++ linux-2.6.26.3-vs2.3.0.35.5/arch/ia64/Kconfig 2008-09-05
20:06:15.000000000 +0200
+@@ -638,6 +638,8 @@ source "arch/ia64/hp/sim/Kconfig"
source "arch/ia64/Kconfig.debug"
@@ -279,10 +243,10 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.25.4/arch/ia64/kernel/entry.S
linux-2.6.25.4-vs2.3.0.34.10/arch/ia64/kernel/entry.S
---- linux-2.6.25.4/arch/ia64/kernel/entry.S 2008-04-17 12:05:28.000000000
-0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/ia64/kernel/entry.S 2008-04-19
15:14:51.000000000 -0400
-@@ -1547,7 +1547,7 @@ sys_call_table:
+diff -NurpP --minimal linux-2.6.26.3/arch/ia64/kernel/entry.S
linux-2.6.26.3-vs2.3.0.35.5/arch/ia64/kernel/entry.S
+--- linux-2.6.26.3/arch/ia64/kernel/entry.S 2008-07-13 23:51:29.000000000
+0200
++++ linux-2.6.26.3-vs2.3.0.35.5/arch/ia64/kernel/entry.S 2008-09-05
20:06:15.000000000 +0200
+@@ -1619,7 +1619,7 @@ sys_call_table:
data8 sys_mq_notify
data8 sys_mq_getsetattr
data8 sys_kexec_load
@@ -291,9 +255,9 @@
data8 sys_waitid // 1270
data8 sys_add_key
data8 sys_request_key
-diff -NurpP --minimal linux-2.6.25.4/arch/ia64/kernel/perfmon.c
linux-2.6.25.4-vs2.3.0.34.10/arch/ia64/kernel/perfmon.c
---- linux-2.6.25.4/arch/ia64/kernel/perfmon.c 2008-04-17 12:05:28.000000000
-0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/ia64/kernel/perfmon.c 2008-04-19
15:14:51.000000000 -0400
+diff -NurpP --minimal linux-2.6.26.3/arch/ia64/kernel/perfmon.c
linux-2.6.26.3-vs2.3.0.35.5/arch/ia64/kernel/perfmon.c
+--- linux-2.6.26.3/arch/ia64/kernel/perfmon.c 2008-07-13 23:51:29.000000000
+0200
++++ linux-2.6.26.3-vs2.3.0.35.5/arch/ia64/kernel/perfmon.c 2008-09-05
20:06:15.000000000 +0200
@@ -40,6 +40,7 @@
#include <linux/capability.h>
#include <linux/rcupdate.h>
@@ -302,7 +266,7 @@
#include <asm/errno.h>
#include <asm/intrinsics.h>
-@@ -2374,7 +2375,7 @@ pfm_smpl_buffer_alloc(struct task_struct
+@@ -2376,7 +2377,7 @@ pfm_smpl_buffer_alloc(struct task_struct
*/
insert_vm_struct(mm, vma);
@@ -311,9 +275,9 @@
vm_stat_account(vma->vm_mm, vma->vm_flags, vma->vm_file,
vma_pages(vma));
up_write(&task->mm->mmap_sem);
-diff -NurpP --minimal linux-2.6.25.4/arch/ia64/kernel/process.c
linux-2.6.25.4-vs2.3.0.34.10/arch/ia64/kernel/process.c
---- linux-2.6.25.4/arch/ia64/kernel/process.c 2008-04-17 12:05:28.000000000
-0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/ia64/kernel/process.c 2008-04-21
11:09:01.000000000 -0400
+diff -NurpP --minimal linux-2.6.26.3/arch/ia64/kernel/process.c
linux-2.6.26.3-vs2.3.0.35.5/arch/ia64/kernel/process.c
+--- linux-2.6.26.3/arch/ia64/kernel/process.c 2008-07-13 23:51:29.000000000
+0200
++++ linux-2.6.26.3-vs2.3.0.35.5/arch/ia64/kernel/process.c 2008-09-05
20:06:15.000000000 +0200
@@ -105,8 +105,8 @@ show_regs (struct pt_regs *regs)
unsigned long ip = regs->cr_iip + ia64_psr(regs)->ri;
@@ -325,20 +289,20 @@
printk("psr : %016lx ifs : %016lx ip : [<%016lx>] %s (%s)\n",
regs->cr_ipsr, regs->cr_ifs, ip, print_tainted(),
init_utsname()->release);
-diff -NurpP --minimal linux-2.6.25.4/arch/ia64/kernel/ptrace.c
linux-2.6.25.4-vs2.3.0.34.10/arch/ia64/kernel/ptrace.c
---- linux-2.6.25.4/arch/ia64/kernel/ptrace.c 2008-04-17 12:05:28.000000000
-0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/ia64/kernel/ptrace.c 2008-04-19
15:14:51.000000000 -0400
-@@ -17,6 +17,7 @@
- #include <linux/security.h>
- #include <linux/audit.h>
+diff -NurpP --minimal linux-2.6.26.3/arch/ia64/kernel/ptrace.c
linux-2.6.26.3-vs2.3.0.35.5/arch/ia64/kernel/ptrace.c
+--- linux-2.6.26.3/arch/ia64/kernel/ptrace.c 2008-07-13 23:51:29.000000000
+0200
++++ linux-2.6.26.3-vs2.3.0.35.5/arch/ia64/kernel/ptrace.c 2008-09-05
20:06:15.000000000 +0200
+@@ -22,6 +22,7 @@
#include <linux/signal.h>
+ #include <linux/regset.h>
+ #include <linux/elf.h>
+#include <linux/vs_base.h>
#include <asm/pgtable.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-2.6.25.4/arch/ia64/kernel/traps.c
linux-2.6.25.4-vs2.3.0.34.10/arch/ia64/kernel/traps.c
---- linux-2.6.25.4/arch/ia64/kernel/traps.c 2008-04-17 12:05:28.000000000
-0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/ia64/kernel/traps.c 2008-04-21
10:33:04.000000000 -0400
+diff -NurpP --minimal linux-2.6.26.3/arch/ia64/kernel/traps.c
linux-2.6.26.3-vs2.3.0.35.5/arch/ia64/kernel/traps.c
+--- linux-2.6.26.3/arch/ia64/kernel/traps.c 2008-07-13 23:51:29.000000000
+0200
++++ linux-2.6.26.3-vs2.3.0.35.5/arch/ia64/kernel/traps.c 2008-09-05
20:06:15.000000000 +0200
@@ -60,8 +60,9 @@ die (const char *str, struct pt_regs *re
put_cpu();
@@ -363,9 +327,9 @@
}
}
}
-diff -NurpP --minimal linux-2.6.25.4/arch/ia64/mm/fault.c
linux-2.6.25.4-vs2.3.0.34.10/arch/ia64/mm/fault.c
---- linux-2.6.25.4/arch/ia64/mm/fault.c 2008-04-17 12:05:28.000000000
-0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/ia64/mm/fault.c 2008-04-19
15:14:52.000000000 -0400
+diff -NurpP --minimal linux-2.6.26.3/arch/ia64/mm/fault.c
linux-2.6.26.3-vs2.3.0.35.5/arch/ia64/mm/fault.c
+--- linux-2.6.26.3/arch/ia64/mm/fault.c 2008-07-13 23:51:29.000000000
+0200
++++ linux-2.6.26.3-vs2.3.0.35.5/arch/ia64/mm/fault.c 2008-09-05
20:06:15.000000000 +0200
@@ -10,6 +10,7 @@
#include <linux/interrupt.h>
#include <linux/kprobes.h>
@@ -374,9 +338,9 @@
#include <asm/pgtable.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-2.6.25.4/arch/m32r/kernel/traps.c
linux-2.6.25.4-vs2.3.0.34.10/arch/m32r/kernel/traps.c
---- linux-2.6.25.4/arch/m32r/kernel/traps.c 2008-04-17 11:31:23.000000000
-0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/m32r/kernel/traps.c 2008-04-19
15:14:52.000000000 -0400
+diff -NurpP --minimal linux-2.6.26.3/arch/m32r/kernel/traps.c
linux-2.6.26.3-vs2.3.0.35.5/arch/m32r/kernel/traps.c
+--- linux-2.6.26.3/arch/m32r/kernel/traps.c 2008-07-13 23:51:29.000000000
+0200
++++ linux-2.6.26.3-vs2.3.0.35.5/arch/m32r/kernel/traps.c 2008-09-05
20:06:15.000000000 +0200
@@ -195,8 +195,9 @@ static void show_registers(struct pt_reg
} else {
printk("SPI: %08lx\n", sp);
@@ -389,10 +353,10 @@
/*
* When in-kernel, we also print out the stack and code at the
-diff -NurpP --minimal linux-2.6.25.4/arch/m68k/Kconfig
linux-2.6.25.4-vs2.3.0.34.10/arch/m68k/Kconfig
---- linux-2.6.25.4/arch/m68k/Kconfig 2008-04-17 12:05:28.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/m68k/Kconfig 2008-04-19
15:14:52.000000000 -0400
-@@ -674,6 +674,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-2.6.26.3/arch/m68k/Kconfig
linux-2.6.26.3-vs2.3.0.35.5/arch/m68k/Kconfig
+--- linux-2.6.26.3/arch/m68k/Kconfig 2008-07-13 23:51:29.000000000 +0200
++++ linux-2.6.26.3-vs2.3.0.35.5/arch/m68k/Kconfig 2008-09-05
20:06:15.000000000 +0200
+@@ -667,6 +667,8 @@ source "fs/Kconfig"
source "arch/m68k/Kconfig.debug"
@@ -401,9 +365,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.25.4/arch/m68k/kernel/ptrace.c
linux-2.6.25.4-vs2.3.0.34.10/arch/m68k/kernel/ptrace.c
---- linux-2.6.25.4/arch/m68k/kernel/ptrace.c 2008-04-17 11:31:23.000000000
-0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/m68k/kernel/ptrace.c 2008-04-19
15:14:52.000000000 -0400
+diff -NurpP --minimal linux-2.6.26.3/arch/m68k/kernel/ptrace.c
linux-2.6.26.3-vs2.3.0.35.5/arch/m68k/kernel/ptrace.c
+--- linux-2.6.26.3/arch/m68k/kernel/ptrace.c 2008-07-13 23:51:29.000000000
+0200
++++ linux-2.6.26.3-vs2.3.0.35.5/arch/m68k/kernel/ptrace.c 2008-09-05
20:06:15.000000000 +0200
@@ -18,6 +18,7 @@
#include <linux/ptrace.h>
#include <linux/user.h>
@@ -421,10 +385,10 @@
return ret;
out_eio:
-diff -NurpP --minimal linux-2.6.25.4/arch/m68k/kernel/traps.c
linux-2.6.25.4-vs2.3.0.34.10/arch/m68k/kernel/traps.c
---- linux-2.6.25.4/arch/m68k/kernel/traps.c 2008-04-17 12:05:28.000000000
-0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/m68k/kernel/traps.c 2008-04-19
15:14:52.000000000 -0400
-@@ -898,8 +898,8 @@ void show_registers(struct pt_regs *regs
+diff -NurpP --minimal linux-2.6.26.3/arch/m68k/kernel/traps.c
linux-2.6.26.3-vs2.3.0.35.5/arch/m68k/kernel/traps.c
+--- linux-2.6.26.3/arch/m68k/kernel/traps.c 2008-07-13 23:51:29.000000000
+0200
++++ linux-2.6.26.3-vs2.3.0.35.5/arch/m68k/kernel/traps.c 2008-09-05
20:06:15.000000000 +0200
+@@ -909,8 +909,8 @@ void show_registers(struct pt_regs *regs
printk("d4: %08lx d5: %08lx a0: %08lx a1: %08lx\n",
regs->d4, regs->d5, regs->a0, regs->a1);
@@ -435,10 +399,10 @@
addr = (unsigned long)&fp->un;
printk("Frame format=%X ", regs->format);
switch (regs->format) {
-diff -NurpP --minimal linux-2.6.25.4/arch/m68knommu/Kconfig
linux-2.6.25.4-vs2.3.0.34.10/arch/m68knommu/Kconfig
---- linux-2.6.25.4/arch/m68knommu/Kconfig 2008-04-17 12:05:28.000000000
-0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/m68knommu/Kconfig 2008-04-19
15:14:52.000000000 -0400
-@@ -722,6 +722,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-2.6.26.3/arch/m68knommu/Kconfig
linux-2.6.26.3-vs2.3.0.35.5/arch/m68knommu/Kconfig
+--- linux-2.6.26.3/arch/m68knommu/Kconfig 2008-07-13 23:51:29.000000000
+0200
++++ linux-2.6.26.3-vs2.3.0.35.5/arch/m68knommu/Kconfig 2008-09-05
20:06:15.000000000 +0200
+@@ -725,6 +725,8 @@ source "fs/Kconfig"
source "arch/m68knommu/Kconfig.debug"
@@ -447,10 +411,10 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.25.4/arch/m68knommu/kernel/traps.c
linux-2.6.25.4-vs2.3.0.34.10/arch/m68knommu/kernel/traps.c
---- linux-2.6.25.4/arch/m68knommu/kernel/traps.c 2008-04-17
10:37:14.000000000 -0400
-+++ linux-2.6.25.4-vs2.3.0.34.10/arch/m68knommu/kernel/traps.c 2008-04-19
15:14:52.000000000 -0400
-@@ -78,8 +78,9 @@ void die_if_kernel(char *str, struct pt_
+diff -NurpP --minimal linux-2.6.26.3/arch/m68knommu/kernel/traps.c
linux-2.6.26.3-vs2.3.0.35.5/arch/m68knommu/kernel/traps.c
+--- linux-2.6.26.3/arch/m68knommu/kernel/traps.c 2008-07-13
23:51:29.000000000 +0200
++++ linux-2.6.26.3-vs2.3.0.35.5/arch/m68knommu/kernel/traps.c 2008-09-05
20:06:15.000000000 +0200
+@@ -79,8 +79,9 @@ void die_if_kernel(char *str, struct pt_
printk(KERN_EMERG "d4: %08lx d5: %08lx a0: %08lx a1: %08lx\n",
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-tproxy.patch?r1=1.1.2.1&r2=1.1.2.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/linux-2.6-vs2.3.patch?r1=1.2.4.11.2.38&r2=1.2.4.11.2.39&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
