]>
Commit | Line | Data |
---|---|---|
2380c486 JR |
1 | Missing header for routes patch, caused vs2.3 route.h mixing |
2 | --- a/net/ipv4/netfilter/nf_nat_core.c~ 2008-01-24 23:58:37.000000000 +0100 | |
3 | +++ a/net/ipv4/netfilter/nf_nat_core.c 2008-03-30 21:00:19.349593833 +0200 | |
4 | @@ -15,6 +15,7 @@ | |
5 | #include <net/checksum.h> | |
6 | #include <net/icmp.h> | |
7 | #include <net/ip.h> | |
8 | +#include <net/route.h> | |
9 | #include <net/tcp.h> /* For tcp_prot in getorigdst */ | |
10 | #include <linux/icmp.h> | |
11 | #include <linux/udp.h> | |
2bf5ad28 AM |
12 | --- linux-2.6.33/arch/x86/kernel/process.c~ 2010-02-24 19:52:17.000000000 +0100 |
13 | +++ linux-2.6.33/arch/x86/kernel/process.c 2010-02-25 23:44:56.487156216 +0100 | |
14 | @@ -104,8 +104,8 @@ | |
15 | product = ""; | |
16 | ||
17 | printk(KERN_CONT "\n"); | |
18 | - printk(KERN_DEFAULT "Pid: %d, comm: %.20s %s %s %.*s %s/%s\n", | |
f5b73038 | 19 | - current->pid, current->comm, print_tainted(), |
2bf5ad28 AM |
20 | + printk(KERN_DEFAULT "Pid: %d, xid: #%u, comm: %.20s %s %s %.*s %s/%s\n", |
21 | + task_pid_nr(current), current->xid, current->comm, print_tainted(), | |
c72ef0bc AM |
22 | init_utsname()->release, |
23 | (int)strcspn(init_utsname()->version, " "), | |
2bf5ad28 | 24 | init_utsname()->version, board, product); |
c72ef0bc AM |
25 | --- linux-2.6.31/arch/x86/kernel/dumpstack.c~ 2009-09-16 08:32:02.000000000 +0200 |
26 | +++ linux-2.6.31/arch/x86/kernel/dumpstack.c 2009-09-17 21:58:13.778791960 +0200 | |
27 | @@ -180,8 +180,8 @@ | |
28 | get_bp(bp); | |
29 | #endif | |
30 | ||
31 | - printk("Pid: %d, comm: %.20s %s %s %.*s\n", | |
f5b73038 | 32 | - current->pid, current->comm, print_tainted(), |
eafd3803 | 33 | + printk("Pid: %d, comm: %.20s xid: #%u %s %s %.*s\n", |
f5b73038 | 34 | + current->pid, current->comm, current->xid, print_tainted(), |
c72ef0bc AM |
35 | init_utsname()->release, |
36 | (int)strcspn(init_utsname()->version, " "), | |
37 | init_utsname()->version); | |
7def13ad | 38 | |
76514441 | 39 |