[kernel] r16932 - dists/squeeze/linux-2.6/debian/patches/features/all/openvz

[Dann Frazier]

Author: dannf
Date: Mon Feb 21 22:27:39 2011
New Revision: 16932

Log:
adjust context to apply

Modified:
   dists/squeeze/linux-2.6/debian/patches/features/all/openvz/openvz.patch

Modified: dists/squeeze/linux-2.6/debian/patches/features/all/openvz/openvz.patch
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/features/all/openvz/openvz.patch	Mon Feb 21 22:27:25 2011	(r16931)
+++ dists/squeeze/linux-2.6/debian/patches/features/all/openvz/openvz.patch	Mon Feb 21 22:27:39 2011	(r16932)
@@ -19980,9 +19980,9 @@
  
  	task_name(m, task);
  	task_state(m, ns, pid, task);
-@@ -340,6 +380,14 @@ int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
- 	task_show_regs(m, task);
- #endif
+@@ -337,6 +377,14 @@ int proc_pid_status(struct seq_file *m,
+ 	task_cap(m, task);
+ 	cpuset_task_status_allowed(m, task);
  	task_context_switch_counts(m, task);
 +#ifdef CONFIG_BEANCOUNTERS
 +	ub_dump_task_info(task,