--- /dev/null
+From stable-bounces@linux.kernel.org Sat Apr 29 11:13:33 2006
+Date: Sat, 29 Apr 2006 14:07:49 -0400
+From: Chuck Ebbert <76306.1226@compuserve.com>
+To: linux-kernel <linux-kernel@vger.kernel.org>
+Message-ID: <200604291409_MC3-1-BE50-16AD@compuserve.com>
+Content-Disposition: inline
+Cc: Linus Torvalds <torvalds@osdl.org>, Andi Kleen <ak@suse.de>,
+ linux-stable <stable@kernel.org>
+Subject: i386: fix broken FP exception handling
+
+The FXSAVE information leak patch introduced a bug in FP exception
+handling: it clears FP exceptions only when there are already
+none outstanding. Mikael Pettersson reported that causes problems
+with the Erlang runtime and has tested this fix.
+
+Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com>
+Acked-by: Mikael Pettersson <mikpe@it.uu.se>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ include/asm-i386/i387.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- linux-2.6.16.11.orig/include/asm-i386/i387.h
++++ linux-2.6.16.11/include/asm-i386/i387.h
+@@ -58,13 +58,13 @@ static inline void __save_init_fpu( stru
+ alternative_input(
+ "fnsave %[fx] ;fwait;" GENERIC_NOP8 GENERIC_NOP4,
+ "fxsave %[fx]\n"
+- "bt $7,%[fsw] ; jc 1f ; fnclex\n1:",
++ "bt $7,%[fsw] ; jnc 1f ; fnclex\n1:",
+ X86_FEATURE_FXSR,
+ [fx] "m" (tsk->thread.i387.fxsave),
+ [fsw] "m" (tsk->thread.i387.fxsave.swd) : "memory");
+ /* AMD K7/K8 CPUs don't save/restore FDP/FIP/FOP unless an exception
+ is pending. Clear the x87 state here by setting it to fixed
+- values. __per_cpu_offset[0] is a random variable that should be in L1 */
++ values. safe_address is a random variable that should be in L1 */
+ alternative_input(
+ GENERIC_NOP8 GENERIC_NOP2,
+ "emms\n\t" /* clear stack tags */
projects / thirdparty / kernel / stable-queue.git / commitdiff
