kernel-vserver-fixes.patch

   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>
  12 --- linux-2.6.31/arch/powerpc/include/asm/unistd.h~     2009-10-06 08:19:50.248628538 +0200
  13 +++ linux-2.6.31/arch/powerpc/include/asm/unistd.h      2009-10-06 08:20:59.331122621 +0200
  14 @@ -275,7 +275,7 @@
  15  #endif
  16  #define __NR_rtas              255
  17  #define __NR_sys_debug_setcontext 256
  18 -#define __NR_vserver           258
  19 +#define __NR_vserver           257
  20  #define __NR_migrate_pages     258
  21  #define __NR_mbind             259
  22  #define __NR_get_mempolicy     260
  23 --- linux-2.6.31/arch/x86/kernel/process_32.c~  2009-09-16 08:32:03.000000000 +0200
  24 +++ linux-2.6.31/arch/x86/kernel/process_32.c   2009-09-17 21:57:42.546921657 +0200
  25 @@ -148,8 +148,8 @@
  26         board = dmi_get_system_info(DMI_PRODUCT_NAME);
  27         if (!board)
  28                 board = "";
  29 -       printk("Pid: %d, comm: %s %s (%s %.*s) %s\n",
  30 -                       task_pid_nr(current), current->comm,
  31 +       printk("Pid: %d, comm: %s xid: #%u %s (%s %.*s) %s\n",
  32 +                       task_pid_nr(current), current->comm, current->xid,
  33                         print_tainted(), init_utsname()->release,
  34                         (int)strcspn(init_utsname()->version, " "),
  35                         init_utsname()->version, board);
  36 --- linux-2.6.31/arch/x86/kernel/process_64.c~  2009-09-16 08:32:03.000000000 +0200
  37 +++ linux-2.6.31/arch/x86/kernel/process_64.c   2009-09-17 21:57:55.742127534 +0200
  38 @@ -172,8 +172,8 @@
  39         board = dmi_get_system_info(DMI_PRODUCT_NAME);
  40         if (!board)
  41                 board = "";
  42 -       printk(KERN_INFO "Pid: %d, comm: %.20s %s %s %.*s %s\n",
  43 -               current->pid, current->comm, print_tainted(),
  44 +       printk(KERN_INFO "Pid: %d, comm: %.20s xid: #%u %s %s %.*s %s\n",
  45 +               current->pid, current->comm, current->xid, print_tainted(),
  46                 init_utsname()->release,
  47                 (int)strcspn(init_utsname()->version, " "),
  48                 init_utsname()->version, board);
  49 --- linux-2.6.31/arch/x86/kernel/dumpstack.c~   2009-09-16 08:32:02.000000000 +0200
  50 +++ linux-2.6.31/arch/x86/kernel/dumpstack.c    2009-09-17 21:58:13.778791960 +0200
  51 @@ -180,8 +180,8 @@
  52                 get_bp(bp);
  53  #endif
  54
  55 -       printk("Pid: %d, comm: %.20s %s %s %.*s\n",
  56 -               current->pid, current->comm, print_tainted(),
  57 +       printk("Pid: %d, comm: %.20s xid: #%u %s %s %.*s\n",
  58 +               current->pid, current->comm, current->xid, print_tainted(),
  59                 init_utsname()->release,
  60                 (int)strcspn(init_utsname()->version, " "),
  61                 init_utsname()->version);