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/x86/kernel/process_32.c~  2009-09-16 08:32:03.000000000 +0200
  13 +++ linux-2.6.31/arch/x86/kernel/process_32.c   2009-09-17 21:57:42.546921657 +0200
  14 @@ -148,8 +148,8 @@
  15         board = dmi_get_system_info(DMI_PRODUCT_NAME);
  16         if (!board)
  17                 board = "";
  18 -       printk("Pid: %d, comm: %s %s (%s %.*s) %s\n",
  19 -                       task_pid_nr(current), current->comm,
  20 +       printk("Pid: %d, comm: %s xid: #%u %s (%s %.*s) %s\n",
  21 +                       task_pid_nr(current), current->comm, current->xid,
  22                         print_tainted(), init_utsname()->release,
  23                         (int)strcspn(init_utsname()->version, " "),
  24                         init_utsname()->version, board);
  25 --- linux-2.6.31/arch/x86/kernel/process_64.c~  2009-09-16 08:32:03.000000000 +0200
  26 +++ linux-2.6.31/arch/x86/kernel/process_64.c   2009-09-17 21:57:55.742127534 +0200
  27 @@ -172,8 +172,8 @@
  28         board = dmi_get_system_info(DMI_PRODUCT_NAME);
  29         if (!board)
  30                 board = "";
  31 -       printk(KERN_INFO "Pid: %d, comm: %.20s %s %s %.*s %s\n",
  32 -               current->pid, current->comm, print_tainted(),
  33 +       printk(KERN_INFO "Pid: %d, comm: %.20s xid: #%u %s %s %.*s %s\n",
  34 +               current->pid, current->comm, current->xid, print_tainted(),
  35                 init_utsname()->release,
  36                 (int)strcspn(init_utsname()->version, " "),
  37                 init_utsname()->version, board);
  38 --- linux-2.6.31/arch/x86/kernel/dumpstack.c~   2009-09-16 08:32:02.000000000 +0200
  39 +++ linux-2.6.31/arch/x86/kernel/dumpstack.c    2009-09-17 21:58:13.778791960 +0200
  40 @@ -180,8 +180,8 @@
  41                 get_bp(bp);
  42  #endif
  43
  44 -       printk("Pid: %d, comm: %.20s %s %s %.*s\n",
  45 -               current->pid, current->comm, print_tainted(),
  46 +       printk("Pid: %d, comm: %.20s xid: #%u %s %s %.*s\n",
  47 +               current->pid, current->comm, current->xid, print_tainted(),
  48                 init_utsname()->release,
  49                 (int)strcspn(init_utsname()->version, " "),
  50                 init_utsname()->version);
  51 --- linux-2.6.32/drivers/infiniband/hw/ipath/ipath_user_pages.c~        2009-12-04 23:09:58.438777066 +0100
  52 +++ linux-2.6.32/drivers/infiniband/hw/ipath/ipath_user_pages.c 2009-12-04 23:12:42.808693591 +0100
  53 @@ -34,7 +34,7 @@
  54  #include <linux/mm.h>
  55  #include <linux/device.h>
  56  #include <linux/sched.h>
  57 -// #include <linux/vs_memory.h>
  58 +#include <linux/vs_memory.h>
  59
  60  #include "ipath_kernel.h"
  61
  62