lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86, fpu: Remove unnecessary ifdefs from i387 code.

Browse Source 
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>
This commit is contained in:
Brian Gerst
2010-09-03 21:17:16 -04:00
committed by H. Peter Anvin
parent a334fe43d8
commit 8eb91a577d
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
arch/x86/include/asm/i387.h
View File

@@ -55,6 +55,12 @@ extern int save_i387_xstate_ia32(void __user *buf);
extern int restore_i387_xstate_ia32(void __user *buf); extern int restore_i387_xstate_ia32(void __user *buf);
#endif #endif
#ifdef CONFIG_MATH_EMULATION
extern void finit_soft_fpu(struct i387_soft_struct *soft);
#else
static inline void finit_soft_fpu(struct i387_soft_struct *soft) {}
#endif
#define X87_FSW_ES (1 << 7) /* Exception Summary */ #define X87_FSW_ES (1 << 7) /* Exception Summary */
static __always_inline __pure bool use_xsaveopt(void) static __always_inline __pure bool use_xsaveopt(void)
@@ -189,12 +195,6 @@ static inline void fpu_save_init(struct fpu *fpu)
#else /* CONFIG_X86_32 */ #else /* CONFIG_X86_32 */
#ifdef CONFIG_MATH_EMULATION
extern void finit_soft_fpu(struct i387_soft_struct *soft);
#else
static inline void finit_soft_fpu(struct i387_soft_struct *soft) {}
#endif
/* perform fxrstor iff the processor has extended states, otherwise frstor */ /* perform fxrstor iff the processor has extended states, otherwise frstor */
static inline int fxrstor_checking(struct i387_fxsave_struct *fx) static inline int fxrstor_checking(struct i387_fxsave_struct *fx)
{ {

4
arch/x86/kernel/i387.c
View File

@@ -79,10 +79,8 @@ static void __cpuinit init_thread_xstate(void)
if (cpu_has_fxsr) if (cpu_has_fxsr)
xstate_size = sizeof(struct i387_fxsave_struct); xstate_size = sizeof(struct i387_fxsave_struct);
#ifdef CONFIG_X86_32
else else
xstate_size = sizeof(struct i387_fsave_struct); xstate_size = sizeof(struct i387_fsave_struct);
#endif
} }
/* /*
@@ -119,12 +117,10 @@ void __cpuinit fpu_init(void)
void fpu_finit(struct fpu *fpu) void fpu_finit(struct fpu *fpu)
{ {
#ifdef CONFIG_X86_32
if (!HAVE_HWFP) { if (!HAVE_HWFP) {
finit_soft_fpu(&fpu->state->soft); finit_soft_fpu(&fpu->state->soft);
return; return;
} }
#endif
if (cpu_has_fxsr) { if (cpu_has_fxsr) {
struct i387_fxsave_struct *fx = &fpu->state->fxsave; struct i387_fxsave_struct *fx = &fpu->state->fxsave;