[kernel] r22401 - in dists/squeeze-security/linux-2.6/debian: config patches/features/all/openvz

[Ben Hutchings]

Author: benh
Date: Tue Feb 17 23:28:06 2015
New Revision: 22401

Log:
Revert more changes related to x86 FPU state management fixes

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

Modified: dists/squeeze-security/linux-2.6/debian/config/defines
==============================================================================
--- dists/squeeze-security/linux-2.6/debian/config/defines	Tue Feb 17 22:48:24 2015	(r22400)
+++ dists/squeeze-security/linux-2.6/debian/config/defines	Tue Feb 17 23:28:06 2015	(r22401)
@@ -14,7 +14,6 @@
  ip_build_and_send_pkt
  tcp_cong_avoid_ai
  tcp_slow_start
- math_state_restore
 
 [base]
 arches:

Modified: dists/squeeze-security/linux-2.6/debian/patches/features/all/openvz/openvz.patch
==============================================================================
--- dists/squeeze-security/linux-2.6/debian/patches/features/all/openvz/openvz.patch	Tue Feb 17 22:48:24 2015	(r22400)
+++ dists/squeeze-security/linux-2.6/debian/patches/features/all/openvz/openvz.patch	Tue Feb 17 23:28:06 2015	(r22401)
@@ -6551,7 +6551,6 @@
  wrapper introduction in 910ffdb18a6408e14febbb6e4b6840fd2c928c82]
 [bwh: Fix context for changes to ip_send_reply() in fix for CVE-2012-3552]
 [dannf: Fix content to skb_header_size() after fix for CVE-2012-3552]
-[bwh: Fix context for changes to struct task_struct in 2.6.32-48squeeze11]
 
 --- /dev/null
 +++ b/COPYING.Parallels
@@ -34675,9 +34674,9 @@
  	 */
  	struct pipe_inode_info *splice_pipe;
 @@ -1595,6 +1634,19 @@ struct task_struct {
- #ifndef __GENKSYMS__
- 	unsigned long thread_has_fpu;
- #endif
+ 	unsigned long trace_recursion;
+ #endif /* CONFIG_TRACING */
+ 	unsigned long stack_start;
 +#ifdef CONFIG_BEANCOUNTERS
 +	struct task_beancounter task_bc;
 +#endif