[kernel] r22345 - dists/squeeze-security/linux-2.6/debian/patches/bugfix/x86

[Ben Hutchings]

Author: benh
Date: Sat Feb  7 05:28:34 2015
New Revision: 22345

Log:
Move a syntax fix into the preceding patch

I was confused about whether task_state::xstate was a pointer or
struct, and used the wrong operators when backporting "x86-32, fpu:
Rewrite fpu_save_init()" then fixed them in "x86, fpu: Merge
fpu_save_init()".  Change these patches so they're right first time.

Modified:
   dists/squeeze-security/linux-2.6/debian/patches/bugfix/x86/0003-x86-32-fpu-rewrite-fpu_save_init.patch
   dists/squeeze-security/linux-2.6/debian/patches/bugfix/x86/0004-x86-fpu-merge-fpu_save_init.patch

Modified: dists/squeeze-security/linux-2.6/debian/patches/bugfix/x86/0003-x86-32-fpu-rewrite-fpu_save_init.patch
==============================================================================
--- dists/squeeze-security/linux-2.6/debian/patches/bugfix/x86/0003-x86-32-fpu-rewrite-fpu_save_init.patch	Fri Feb  6 19:26:16 2015	(r22344)
+++ dists/squeeze-security/linux-2.6/debian/patches/bugfix/x86/0003-x86-32-fpu-rewrite-fpu_save_init.patch	Sat Feb  7 05:28:34 2015	(r22345)
@@ -72,7 +72,7 @@
 -		 * we can do a simple return here or be paranoid :)
 -		 */
 -		goto clear_state;
-+		if (!(tsk->thread.xstate.xsave.xsave_hdr.xstate_bv & XSTATE_FP))
++		if (!(tsk->thread.xstate->xsave.xsave_hdr.xstate_bv & XSTATE_FP))
 +			return;
 +	} else if (use_fxsr()) {
 +		fxsave(tsk);
@@ -92,7 +92,7 @@
 -		[fx] "m" (tsk->thread.xstate->fxsave),
 -		[fsw] "m" (tsk->thread.xstate->fxsave.swd) : "memory");
 -clear_state:
-+	if (unlikely(tsk->thread.xstate.fxsave->swd & X87_FSW_ES))
++	if (unlikely(tsk->thread.xstate->fxsave.swd & X87_FSW_ES))
 +		asm volatile("fnclex");
 +
  	/* AMD K7/K8 CPUs don't save/restore FDP/FIP/FOP unless an exception

Modified: dists/squeeze-security/linux-2.6/debian/patches/bugfix/x86/0004-x86-fpu-merge-fpu_save_init.patch
==============================================================================
--- dists/squeeze-security/linux-2.6/debian/patches/bugfix/x86/0004-x86-fpu-merge-fpu_save_init.patch	Fri Feb  6 19:26:16 2015	(r22344)
+++ dists/squeeze-security/linux-2.6/debian/patches/bugfix/x86/0004-x86-fpu-merge-fpu_save_init.patch	Sat Feb  7 05:28:34 2015	(r22345)
@@ -84,24 +84,6 @@
  /* We need a safe address that is cheap to find and that is already
     in L1 during context switch. The best choices are unfortunately
     different for UP and SMP */
-@@ -224,7 +191,7 @@ static inline void fpu_save_init(struct task_struct *tsk)
- 		/*
- 		 * xsave header may indicate the init state of the FP.
- 		 */
--		if (!(tsk->thread.xstate.xsave.xsave_hdr.xstate_bv & XSTATE_FP))
-+		if (!(tsk->thread.xstate->xsave.xsave_hdr.xstate_bv & XSTATE_FP))
- 			return;
- 	} else if (use_fxsr()) {
- 		fxsave(tsk);
-@@ -234,7 +201,7 @@ static inline void fpu_save_init(struct task_struct *tsk)
- 		return;
- 	}
- 
--	if (unlikely(tsk->thread.xstate.fxsave->swd & X87_FSW_ES))
-+	if (unlikely(tsk->thread.xstate->fxsave.swd & X87_FSW_ES))
- 		asm volatile("fnclex");
- 
- 	/* AMD K7/K8 CPUs don't save/restore FDP/FIP/FOP unless an exception
 @@ -244,13 +211,11 @@ static inline void fpu_save_init(struct task_struct *tsk)
  		asm volatile(
  			"fnclex\n\t"