diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-14 05:18:08 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-14 05:18:08 -0400 |
| commit | 31677619650cac2bcc9f50920824323b005e3d8a (patch) | |
| tree | 9735dbf085ed0cb4a37eb3c285099850e0fb3742 /include/asm-x86 | |
| parent | c2dcfde8274883e1f6050784dcbd34b01e824b91 (diff) | |
| parent | 6ffac1e90a17ea0aded5c581204397421eec91b6 (diff) | |
Merge branch 'x86/fpu' into x86/urgent
Diffstat (limited to 'include/asm-x86')
| -rw-r--r-- | include/asm-x86/i387.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/asm-x86/i387.h b/include/asm-x86/i387.h index 96fa8449ff11..0048fb77afc4 100644 --- a/include/asm-x86/i387.h +++ b/include/asm-x86/i387.h | |||
| @@ -62,8 +62,6 @@ static inline int restore_fpu_checking(struct i387_fxsave_struct *fx) | |||
| 62 | #else | 62 | #else |
| 63 | : [fx] "cdaSDb" (fx), "m" (*fx), "0" (0)); | 63 | : [fx] "cdaSDb" (fx), "m" (*fx), "0" (0)); |
| 64 | #endif | 64 | #endif |
| 65 | if (unlikely(err)) | ||
| 66 | init_fpu(current); | ||
| 67 | return err; | 65 | return err; |
| 68 | } | 66 | } |
| 69 | 67 | ||