Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8eb91a57 authored by Brian Gerst's avatar Brian Gerst Committed by H. Peter Anvin
Browse files

x86, fpu: Remove unnecessary ifdefs from i387 code. 



Remove ifdefs for code that the compiler can optimize away on 64-bit.

Signed-off-by: default avatarBrian Gerst <brgerst@gmail.com>
Acked-by: default avatarPekka 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: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent a334fe43

arch/x86/include/asm/i387.h

+6 −6
Original line number Original line Diff line number Diff line
@@ -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)

{

{

arch/x86/kernel/i387.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -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;