summaryrefslogtreecommitdiffstats
path: root/include/asm-x86
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-08-14 11:18:08 +0200
committerIngo Molnar <mingo@elte.hu>2008-08-14 11:18:08 +0200
commit31677619650cac2bcc9f50920824323b005e3d8a (patch)
tree9735dbf085ed0cb4a37eb3c285099850e0fb3742 /include/asm-x86
parentc2dcfde8274883e1f6050784dcbd34b01e824b91 (diff)
parent6ffac1e90a17ea0aded5c581204397421eec91b6 (diff)
downloadkernel-crypto-31677619650cac2bcc9f50920824323b005e3d8a.tar.gz
kernel-crypto-31677619650cac2bcc9f50920824323b005e3d8a.tar.xz
kernel-crypto-31677619650cac2bcc9f50920824323b005e3d8a.zip
Merge branch 'x86/fpu' into x86/urgent
Diffstat (limited to 'include/asm-x86')
-rw-r--r--include/asm-x86/i387.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/asm-x86/i387.h b/include/asm-x86/i387.h
index 96fa8449ff1..0048fb77afc 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)
#else
: [fx] "cdaSDb" (fx), "m" (*fx), "0" (0));
#endif
- if (unlikely(err))
- init_fpu(current);
return err;
}