[kernel] r15800 - in dists/sid/linux-2.6/debian/patches: debian features/all/openvz series

[Ben Hutchings]

Author: benh
Date: Fri May 28 01:42:31 2010
New Revision: 15800

Log:
Revert task_struct ABI change made in 2.6.32.14

Added:
   dists/sid/linux-2.6/debian/patches/debian/revert-task_struct-abi-change.patch
Modified:
   dists/sid/linux-2.6/debian/patches/features/all/openvz/openvz.patch
   dists/sid/linux-2.6/debian/patches/series/14

Added: dists/sid/linux-2.6/debian/patches/debian/revert-task_struct-abi-change.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/debian/revert-task_struct-abi-change.patch	Fri May 28 01:42:31 2010	(r15800)
@@ -0,0 +1,13 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Subject: Revert task_struct ABI change made in 2.6.32.14
+
+--- a/include/linux/sched.h
++++ b/include/linux/sched.h
+@@ -1541,6 +1541,7 @@ struct task_struct {
+ 	/* bitmask of trace recursion */
+ 	unsigned long trace_recursion;
+ #endif /* CONFIG_TRACING */
++	unsigned long stack_start;
+ };
+ 
+ /* Future-safe accessor for struct task_struct's cpus_allowed. */

Modified: dists/sid/linux-2.6/debian/patches/features/all/openvz/openvz.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/openvz/openvz.patch	Fri May 28 00:24:19 2010	(r15799)
+++ dists/sid/linux-2.6/debian/patches/features/all/openvz/openvz.patch	Fri May 28 01:42:31 2010	(r15800)
@@ -34297,9 +34297,9 @@
  	 */
  	struct pipe_inode_info *splice_pipe;
 @@ -1542,6 +1581,19 @@ struct task_struct {
- 	/* bitmask of trace recursion */
  	unsigned long trace_recursion;
  #endif /* CONFIG_TRACING */
+ 	unsigned long stack_start;
 +#ifdef CONFIG_BEANCOUNTERS
 +	struct task_beancounter task_bc;
 +#endif

Modified: dists/sid/linux-2.6/debian/patches/series/14
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/14	Fri May 28 00:24:19 2010	(r15799)
+++ dists/sid/linux-2.6/debian/patches/series/14	Fri May 28 01:42:31 2010	(r15800)
@@ -13,6 +13,7 @@
 - bugfix/all/revert-percpu-stable-changes.patch 
 + bugfix/all/stable/2.6.32.14.patch
 + bugfix/all/revert-percpu-stable-changes-2.patch 
++ debian/revert-task_struct-abi-change.patch
 + bugfix/all/drm-i915-use-pipe_control-instruction-on-ironlake-and-sandy-bridge.patch
 + bugfix/all/drm-i915-fix-non-ironlake-965-class-crashes.patch
 + bugfix/all/drm-i915-disable-fbc-on-915gm-and-945gm.patch