aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/i387.h
diff options
context:
space:
mode:
authorBrian Gerst <brgerst@gmail.com>2010-09-03 21:17:16 -0400
committerH. Peter Anvin <hpa@linux.intel.com>2010-09-09 17:17:18 -0400
commit8eb91a577d7763d21628f6761045328784b1911c (patch)
tree1f09e4075d5c0e01958698df480cf676c5e73f8e /arch/x86/include/asm/i387.h
parenta334fe43d85f570ae907acf988a053c5eff78d6e (diff)
x86, fpu: Remove unnecessary ifdefs from i387 code.
Remove ifdefs for code that the compiler can optimize away on 64-bit. Signed-off-by: Brian Gerst <brgerst@gmail.com> Acked-by: Pekka Enberg <penberg@kernel.org> Cc: Suresh Siddha <suresh.b.siddha@intel.com> LKML-Reference: <1283563039-3466-10-git-send-email-brgerst@gmail.com> Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86/include/asm/i387.h')
-rw-r--r--arch/x86/include/asm/i387.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/x86/include/asm/i387.h b/arch/x86/include/asm/i387.h
index 768fcb25900a..42b507e16d1d 100644
--- a/arch/x86/include/asm/i387.h
+++ b/arch/x86/include/asm/i387.h
@@ -55,6 +55,12 @@ extern int save_i387_xstate_ia32(void __user *buf);
55extern int restore_i387_xstate_ia32(void __user *buf); 55extern int restore_i387_xstate_ia32(void __user *buf);
56#endif 56#endif
57 57
58#ifdef CONFIG_MATH_EMULATION
59extern void finit_soft_fpu(struct i387_soft_struct *soft);
60#else
61static inline void finit_soft_fpu(struct i387_soft_struct *soft) {}
62#endif
63
58#define X87_FSW_ES (1 << 7) /* Exception Summary */ 64#define X87_FSW_ES (1 << 7) /* Exception Summary */
59 65
60static __always_inline __pure bool use_xsaveopt(void) 66static __always_inline __pure bool use_xsaveopt(void)
@@ -189,12 +195,6 @@ static inline void fpu_save_init(struct fpu *fpu)
189 195
190#else /* CONFIG_X86_32 */ 196#else /* CONFIG_X86_32 */
191 197
192#ifdef CONFIG_MATH_EMULATION
193extern void finit_soft_fpu(struct i387_soft_struct *soft);
194#else
195static inline void finit_soft_fpu(struct i387_soft_struct *soft) {}
196#endif
197
198/* perform fxrstor iff the processor has extended states, otherwise frstor */ 198/* perform fxrstor iff the processor has extended states, otherwise frstor */
199static inline int fxrstor_checking(struct i387_fxsave_struct *fx) 199static inline int fxrstor_checking(struct i387_fxsave_struct *fx)
200{ 200{