Subject: patch for 2.6.35.12
From: Corey Wright <undefined@pobox.com>
Date: Fri, 1 Apr 2011 10:41:46 -0500
Fri, 1 Apr 2011 10:41:46 -0500
the attached patch addresses the failures of applying patch-2.6.35.10-vs2.3.0.36.33.diff
to the recently released 2.6.35.12.

two failures:
1. Makefile (of course)
2. removal of adjacent code from fs/proc/array.c confused patch

DISCLAIMER: i've only tested the patched 2.6.35.12 kernel with testfs.sh and testme.sh,
but nothing more extensive currently.

NOTE: ext2 & ext3 tested fine, but ext4 failed on some disk limit related tests (203,
213, 231).  i haven't started using ext4 or quotas yet, but i test them with potential
plans in mind. i'm willing to test patches, but hesitant to move to a non-longterm kernel
version.

thanks for linux-vserver!

corey
-- 
undefined@pobox.com


diff -urNpd linux-2.6.35.12-vs2.3.0.36.33.fail/fs/proc/array.c linux-2.6.35.12-vs2.3.0.36.33/fs/proc/array.c
--- linux-2.6.35.12-vs2.3.0.36.33.fail/fs/proc/array.c	2011-03-31 17:54:05.000000000
-0500
+++ linux-2.6.35.12-vs2.3.0.36.33/fs/proc/array.c	2011-03-31 18:09:05.000000000 -0500
@@ -395,6 +395,7 @@ int proc_pid_status(struct seq_file *m, 
 	task_cap(m, task);
 	task_cpus_allowed(m, task);
 	cpuset_task_status_allowed(m, task);
+	task_vs_id(m, task);
 	task_context_switch_counts(m, task);
 	return 0;
 }
diff -urNpd linux-2.6.35.12-vs2.3.0.36.33.fail/Makefile linux-2.6.35.12-vs2.3.0.36.33/Makefile
--- linux-2.6.35.12-vs2.3.0.36.33.fail/Makefile	2011-03-31 17:54:06.000000000 -0500
+++ linux-2.6.35.12-vs2.3.0.36.33/Makefile	2011-03-31 18:00:01.000000000 -0500
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 35
-EXTRAVERSION = .12
+EXTRAVERSION = .12-vs2.3.0.36.33
 NAME = Yokohama
 
 # *DOCUMENTATION*