From: Brian Gerst <brgerst@gmail.com>
To: hpa@zytor.com
Cc: x86@kernel.org, linux-kernel@vger.kernel.org, penberg@kernel.org
Subject: [PATCH 09/12] x86: Remove unnecessary ifdefs from i387 code.
Date: Fri, 3 Sep 2010 21:17:16 -0400 [thread overview]
Message-ID: <1283563039-3466-10-git-send-email-brgerst@gmail.com> (raw)
In-Reply-To: <1283563039-3466-1-git-send-email-brgerst@gmail.com>
Remove ifdefs for code that the compiler can optimize away on 64-bit.
Signed-off-by: Brian Gerst <brgerst@gmail.com>
---
arch/x86/include/asm/i387.h | 12 ++++++------
arch/x86/kernel/i387.c | 4 ----
2 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/arch/x86/include/asm/i387.h b/arch/x86/include/asm/i387.h
index 768fcb2..42b507e 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);
extern int restore_i387_xstate_ia32(void __user *buf);
#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 */
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 */
-#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 */
static inline int fxrstor_checking(struct i387_fxsave_struct *fx)
{
diff --git a/arch/x86/kernel/i387.c b/arch/x86/kernel/i387.c
index 966fdcb..9238309 100644
--- a/arch/x86/kernel/i387.c
+++ b/arch/x86/kernel/i387.c
@@ -74,10 +74,8 @@ static void __cpuinit init_thread_xstate(void)
if (cpu_has_fxsr)
xstate_size = sizeof(struct i387_fxsave_struct);
-#ifdef CONFIG_X86_32
else
xstate_size = sizeof(struct i387_fsave_struct);
-#endif
}
/*
@@ -114,12 +112,10 @@ void __cpuinit fpu_init(void)
void fpu_finit(struct fpu *fpu)
{
-#ifdef CONFIG_X86_32
if (!HAVE_HWFP) {
finit_soft_fpu(&fpu->state->soft);
return;
}
-#endif
if (cpu_has_fxsr) {
struct i387_fxsave_struct *fx = &fpu->state->fxsave;
--
1.7.2.2
next prev parent reply other threads:[~2010-09-04 1:18 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-04 1:17 [PATCH 0/12] x86 FPU cleanups (v2) Brian Gerst
2010-09-04 1:17 ` [PATCH 01/12] x86: Use correct type for %cr4 Brian Gerst
2010-09-04 6:45 ` Pekka Enberg
2010-09-10 1:46 ` [tip:x86/fpu] " tip-bot for Brian Gerst
2010-09-04 1:17 ` [PATCH 02/12] x86: Merge fpu_init() Brian Gerst
2010-09-04 6:45 ` Pekka Enberg
2010-09-10 1:46 ` [tip:x86/fpu] x86, fpu: " tip-bot for Brian Gerst
2010-09-04 1:17 ` [PATCH 03/12] x86: Merge tolerant_fwait() Brian Gerst
2010-09-04 6:46 ` Pekka Enberg
2010-09-10 1:46 ` [tip:x86/fpu] x86, fpu: " tip-bot for Brian Gerst
2010-09-04 1:17 ` [PATCH 04/12] x86: Merge __save_init_fpu() Brian Gerst
2010-09-04 6:47 ` Pekka Enberg
2010-09-10 1:47 ` [tip:x86/fpu] x86, fpu: " tip-bot for Brian Gerst
2010-09-04 1:17 ` [PATCH 05/12] x86-64: Disable preemption when using TS_USEDFPU Brian Gerst
2010-09-04 6:47 ` Pekka Enberg
2010-09-10 1:47 ` [tip:x86/fpu] x86-64, fpu: " tip-bot for Brian Gerst
2010-09-04 1:17 ` [PATCH 06/12] x86-64: Fix %cs value in convert_from_fxsr() Brian Gerst
2010-09-04 6:51 ` Pekka Enberg
2010-09-10 1:47 ` [tip:x86/fpu] x86-64, fpu: " tip-bot for Brian Gerst
2010-09-04 1:17 ` [PATCH 07/12] x86-64: Simplify constraints for fxsave/fxtstor Brian Gerst
2010-09-04 6:48 ` Pekka Enberg
2010-09-09 21:22 ` H. Peter Anvin
2010-09-09 23:43 ` Brian Gerst
2010-09-10 1:48 ` [tip:x86/fpu] x86-64, fpu: " tip-bot for Brian Gerst
2010-09-04 1:17 ` [PATCH 08/12] x86-32: Remove math_emulate stub Brian Gerst
2010-09-04 6:48 ` Pekka Enberg
2010-09-10 1:48 ` [tip:x86/fpu] x86-32, fpu: " tip-bot for Brian Gerst
2010-09-04 1:17 ` Brian Gerst [this message]
2010-09-04 6:49 ` [PATCH 09/12] x86: Remove unnecessary ifdefs from i387 code Pekka Enberg
2010-09-10 1:48 ` [tip:x86/fpu] x86, fpu: " tip-bot for Brian Gerst
2010-09-04 1:17 ` [PATCH 10/12] x86: Remove PSHUFB_XMM5_* macros Brian Gerst
2010-09-04 6:49 ` Pekka Enberg
2010-09-10 1:49 ` [tip:x86/fpu] x86, fpu: " tip-bot for Brian Gerst
2010-09-04 1:17 ` [PATCH 11/12] x86-32: Rewrite fpu_save_init() Brian Gerst
2010-09-04 6:51 ` Pekka Enberg
2010-09-10 1:49 ` [tip:x86/fpu] x86-32, fpu: " tip-bot for Brian Gerst
2010-09-04 1:17 ` [PATCH 12/12] x86: Merge fpu_save_init() Brian Gerst
2010-09-04 6:51 ` Pekka Enberg
2010-09-10 1:50 ` [tip:x86/fpu] x86, fpu: " tip-bot for Brian Gerst
2010-09-04 6:45 ` [PATCH 0/12] x86 FPU cleanups (v2) Pekka Enberg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1283563039-3466-10-git-send-email-brgerst@gmail.com \
--to=brgerst@gmail.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=penberg@kernel.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.