[kernel] r16931 - dists/squeeze/linux-2.6/debian/patches/features/all/vserver

[Dann Frazier]

Author: dannf
Date: Mon Feb 21 22:27:25 2011
New Revision: 16931

Log:
adjust to apply on top of fix for CVE-2011-0710

Modified:
   dists/squeeze/linux-2.6/debian/patches/features/all/vserver/vs2.3.0.36.29.6.patch

Modified: dists/squeeze/linux-2.6/debian/patches/features/all/vserver/vs2.3.0.36.29.6.patch
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/features/all/vserver/vs2.3.0.36.29.6.patch	Mon Feb 21 19:55:17 2011	(r16930)
+++ dists/squeeze/linux-2.6/debian/patches/features/all/vserver/vs2.3.0.36.29.6.patch	Mon Feb 21 22:27:25 2011	(r16931)
@@ -6755,9 +6755,9 @@
  	task_cap(m, task);
  	cpuset_task_status_allowed(m, task);
 +	task_vs_id(m, task);
- #if defined(CONFIG_S390)
- 	task_show_regs(m, task);
- #endif
+ 	task_context_switch_counts(m, task);
+ 	return 0;
+ }
 @@ -449,6 +493,17 @@ static int do_task_stat(struct seq_file
  	/* convert nsec -> ticks */
  	start_time = nsec_to_clock_t(start_time);