From: Sapan Bhatia <sapanb@cs.princeton.edu>
Date: Tue, 11 Mar 2008 20:28:37 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=3512ab17a5bc07b3ab527c97b816ed821cbe91ed;p=linux-2.6.git

---

diff --git a/kernel-2.6-planetlab.spec b/kernel-2.6-planetlab.spec
index 9f26d7a8a..97a338818 100644
--- a/kernel-2.6-planetlab.spec
+++ b/kernel-2.6-planetlab.spec
@@ -157,6 +157,7 @@ Patch592: linux-2.6-592-ztun-sb.patch
 Patch593: linux-2.6-593-egre.patch
 Patch594: linux-2.6-594-new_ns_pid.patch
 Patch595: linux-2.6-595-vserver-new-netns.patch
+Patch596: linux-2.6-596-debug.patch
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
 
 %description
@@ -337,6 +338,7 @@ KERNEL_PREVIOUS=vanilla
 %ApplyPatch 593
 %ApplyPatch 594
 %ApplyPatch 595
+%ApplyPatch 596
 %endif
 
 # NetNS conflict-resolving patch for VINI. Will work with patch vini_pl_patch-1 but may
diff --git a/linux-2.6-596-debug.patch b/linux-2.6-596-debug.patch
new file mode 100644
index 000000000..d4d4081ae
--- /dev/null
+++ b/linux-2.6-596-debug.patch
@@ -0,0 +1,12 @@
+--- linux-2.6.22-596/kernel/vserver/space.c.orig	2008-03-11 16:13:48.000000000 -0400
++++ linux-2.6.22-596/kernel/vserver/space.c	2008-03-11 16:26:08.000000000 -0400
+@@ -195,7 +195,9 @@
+ 	}
+ 
+ 	fs_new = xchg(&current->fs, fs_new);
++ 	printk(KERN_ALERT "Xchg-ing %x with %x\n", &current->nsproxy, proxy_new);
+ 	proxy_new = xchg(&current->nsproxy, proxy_new);
++ 	printk(KERN_ALERT "current->nsproxy: %x\n", &current->nsproxy);
+ 	ret = 0;
+ 
+ 	if (proxy_new)