diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2006-04-30 20:34:39 +0100 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-04-30 20:34:39 +0100 |
| commit | b07019f29328ebb1b48d3faf952b84f07ec9b973 (patch) | |
| tree | 99fbd8379fb9fe17c5b06c74871f71207ebb072e /include/asm-i386 | |
| parent | c3ce7e203af5d8eab7c3390fc991a1fcb152f741 (diff) | |
| parent | e0a515bc6a2188f02916e976f419a8640312e32a (diff) | |
| download | op-kernel-dev-b07019f29328ebb1b48d3faf952b84f07ec9b973.zip op-kernel-dev-b07019f29328ebb1b48d3faf952b84f07ec9b973.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'include/asm-i386')
| -rw-r--r-- | include/asm-i386/i387.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-i386/i387.h b/include/asm-i386/i387.h index 7b1f011..bc1d6ed 100644 --- a/include/asm-i386/i387.h +++ b/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 */ |
