From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 18 May 2010 15:58:16 +0000 (-0700)
Subject: Merge branch 'x86-fpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v2.6.35-rc1~514
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=41d59102e146a4423a490b8eca68a5860af4fe1c

Merge branch 'x86-fpu-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'x86-fpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, fpu: Use static_cpu_has() to implement use_xsave()
  x86: Add new static_cpu_has() function using alternatives
  x86, fpu: Use the proper asm constraint in use_xsave()
  x86, fpu: Unbreak FPU emulation
  x86: Introduce 'struct fpu' and related API
  x86: Eliminate TS_XSAVE
  x86-32: Don't set ignore_fpu_irq in simd exception
  x86: Merge kernel_math_error() into math_error()
  x86: Merge simd_math_error() into math_error()
  x86-32: Rework cache flush denied handler

Fix trivial conflict in arch/x86/kernel/process.c
---

41d59102e146a4423a490b8eca68a5860af4fe1c
diff --cc arch/x86/kernel/process.c
index cc6877535ef4,f18fd9c15247..e7e35219b32f
--- a/arch/x86/kernel/process.c
+++ b/arch/x86/kernel/process.c
@@@ -45,10 -47,8 +46,7 @@@ int arch_dup_task_struct(struct task_st
  
  void free_thread_xstate(struct task_struct *tsk)
  {
- 	if (tsk->thread.xstate) {
- 		kmem_cache_free(task_xstate_cachep, tsk->thread.xstate);
- 		tsk->thread.xstate = NULL;
- 	}
+ 	fpu_free(&tsk->thread.fpu);
 -	WARN(tsk->thread.ds_ctx, "leaking DS context\n");
  }
  
  void free_thread_info(struct thread_info *ti)