From 76b49d5232267e6d15dc1c55a8c8ba05d2c39f33 Mon Sep 17 00:00:00 2001
From: Chuck Ebbert <76306.1226@compuserve.com>
Date: Sat, 29 Apr 2006 14:07:49 -0400
Subject: [PATCH] --- yaml --- r: 26304 b: refs/heads/master c:
 543f2a3382bd7abd7380903518c61f00c7c87577 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/include/asm-i386/i387.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 130c1665a272..155b1f361fec 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 693f7d362055261882659475d2ef022e32edbff1
+refs/heads/master: 543f2a3382bd7abd7380903518c61f00c7c87577
diff --git a/trunk/include/asm-i386/i387.h b/trunk/include/asm-i386/i387.h
index 7b1f01191e70..bc1d6edae1ed 100644
--- a/trunk/include/asm-i386/i387.h
+++ b/trunk/include/asm-i386/i387.h
@@ -58,13 +58,13 @@ static inline void __save_init_fpu( struct task_struct *tsk )
 	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 */