X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=kernel-vserver-fixes.patch;h=b46a5614512d0d5e0ea1bafe7071f439edbecf85;hb=dc74a2edde4bbd0c4c1c48f9cfc0127570a667f7;hp=c2dce3da6ff4154c2a56020e59a0ebfd7c8b2d42;hpb=12a72a37c20bead3bb476d8f06af3781c89894e2;p=packages%2Fkernel.git

diff --git a/kernel-vserver-fixes.patch b/kernel-vserver-fixes.patch
index c2dce3da..b46a5614 100644
--- a/kernel-vserver-fixes.patch
+++ b/kernel-vserver-fixes.patch
@@ -1,61 +1,11 @@
-Missing header for routes patch, caused vs2.3 route.h mixing
---- a/net/ipv4/netfilter/nf_nat_core.c~	2008-01-24 23:58:37.000000000 +0100
-+++ a/net/ipv4/netfilter/nf_nat_core.c	2008-03-30 21:00:19.349593833 +0200
-@@ -15,6 +15,7 @@
- #include <net/checksum.h>
- #include <net/icmp.h>
- #include <net/ip.h>
-+#include <net/route.h>
- #include <net/tcp.h>  /* For tcp_prot in getorigdst */
- #include <linux/icmp.h>
- #include <linux/udp.h>
---- linux-2.6.31/arch/x86/kernel/process_32.c~	2009-09-16 08:32:03.000000000 +0200
-+++ linux-2.6.31/arch/x86/kernel/process_32.c	2009-09-17 21:57:42.546921657 +0200
-@@ -148,8 +148,8 @@
- 	board = dmi_get_system_info(DMI_PRODUCT_NAME);
- 	if (!board)
- 		board = "";
--	printk("Pid: %d, comm: %s %s (%s %.*s) %s\n",
--			task_pid_nr(current), current->comm,
-+	printk("Pid: %d, comm: %s xid: #%u %s (%s %.*s) %s\n",
-+			task_pid_nr(current), current->comm, current->xid,
- 			print_tainted(), init_utsname()->release,
- 			(int)strcspn(init_utsname()->version, " "),
- 			init_utsname()->version, board);
---- linux-2.6.31/arch/x86/kernel/process_64.c~	2009-09-16 08:32:03.000000000 +0200
-+++ linux-2.6.31/arch/x86/kernel/process_64.c	2009-09-17 21:57:55.742127534 +0200
-@@ -172,8 +172,8 @@
- 	board = dmi_get_system_info(DMI_PRODUCT_NAME);
- 	if (!board)
- 		board = "";
--	printk(KERN_INFO "Pid: %d, comm: %.20s %s %s %.*s %s\n",
--		current->pid, current->comm, print_tainted(),
-+	printk(KERN_INFO "Pid: %d, comm: %.20s xid: #%u %s %s %.*s %s\n",
-+		current->pid, current->comm, current->xid, print_tainted(),
- 		init_utsname()->release,
- 		(int)strcspn(init_utsname()->version, " "),
- 		init_utsname()->version, board);
---- linux-2.6.31/arch/x86/kernel/dumpstack.c~	2009-09-16 08:32:02.000000000 +0200
-+++ linux-2.6.31/arch/x86/kernel/dumpstack.c	2009-09-17 21:58:13.778791960 +0200
-@@ -180,8 +180,8 @@
- 		get_bp(bp);
- #endif
- 
--	printk("Pid: %d, comm: %.20s %s %s %.*s\n",
--		current->pid, current->comm, print_tainted(),
-+	printk("Pid: %d, comm: %.20s xid: #%u %s %s %.*s\n",
-+		current->pid, current->comm, current->xid, print_tainted(),
- 		init_utsname()->release,
- 		(int)strcspn(init_utsname()->version, " "),
- 		init_utsname()->version);
---- linux-2.6.32/drivers/infiniband/hw/ipath/ipath_user_pages.c~	2009-12-04 23:09:58.438777066 +0100
-+++ linux-2.6.32/drivers/infiniband/hw/ipath/ipath_user_pages.c	2009-12-04 23:12:42.808693591 +0100
-@@ -34,7 +34,7 @@
- #include <linux/mm.h>
- #include <linux/device.h>
- #include <linux/sched.h>
--// #include <linux/vs_memory.h>
-+#include <linux/vs_memory.h>
- 
- #include "ipath_kernel.h"
- 
+--- linux-3.3/fs/proc/base.c~	2012-03-19 21:44:42.000000000 +0100
++++ linux-3.3/fs/proc/base.c	2012-03-21 12:25:28.051092423 +0100
+@@ -568,6 +568,8 @@
+ 				 struct task_struct *task,
+ 				 int hide_pid_min)
+ {
++	if (vx_check(0, VS_WATCH_P))
++		return true;
+ 	if (pid->hide_pid < hide_pid_min)
+ 		return true;
+ 	if (in_group_p(pid->pid_gid))