leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x86/fpu: Move fpu__init_system_early_generic() out of fpu__detect()

Browse Source 
Move the fpu__init_system_early_generic() call into fpu__init_system(),
which hosts all the system init calls.

Expose fpu__init_system() to other modules - this will be our main and only
system init function.

Reviewed-by: Borislav Petkov <bp@alien8.de>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Ingo Molnar 2015-04-26 15:07:18 +02:00
parent 71eb3c6d15
commit dd863880ac
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/x86/include/asm/fpu/internal.h
View File

@ -41,6 +41,7 @@ extern void eager_fpu_init(void);
extern void fpu__init_system_xstate(void); extern void fpu__init_system_xstate(void);
extern void fpu__init_cpu_xstate(void); extern void fpu__init_cpu_xstate(void);
extern void fpu__init_system(struct cpuinfo_x86 *c);
DECLARE_PER_CPU(struct fpu *, fpu_fpregs_owner_ctx); DECLARE_PER_CPU(struct fpu *, fpu_fpregs_owner_ctx);

16
arch/x86/kernel/fpu/init.c
View File

@ -5,7 +5,10 @@
#include <asm/tlbflush.h> #include <asm/tlbflush.h>
/* /*
* The earliest FPU detection code: * The earliest FPU detection code.
*
* Set the X86_FEATURE_FPU CPU-capability bit based on
* trying to execute an actual sequence of FPU instructions:
*/ */
static void fpu__init_system_early_generic(struct cpuinfo_x86 *c) static void fpu__init_system_early_generic(struct cpuinfo_x86 *c)
{ {
@ -200,8 +203,10 @@ static void fpu__init_system_ctx_switch(void)
* Called on the boot CPU once per system bootup, to set up the initial FPU state that * Called on the boot CPU once per system bootup, to set up the initial FPU state that
* is later cloned into all processes. * is later cloned into all processes.
*/ */
void fpu__init_system(void) void fpu__init_system(struct cpuinfo_x86 *c)
{ {
fpu__init_system_early_generic(c);
/* The FPU has to be operational for some of the later FPU init activities: */ /* The FPU has to be operational for some of the later FPU init activities: */
fpu__init_cpu(); fpu__init_cpu();
@ -227,13 +232,8 @@ static int __init no_387(char *s)
__setup("no387", no_387); __setup("no387", no_387);
/*
* Set the X86_FEATURE_FPU CPU-capability bit based on
* trying to execute an actual sequence of FPU instructions:
*/
void fpu__detect(struct cpuinfo_x86 *c) void fpu__detect(struct cpuinfo_x86 *c)
{ {
fpu__init_system_early_generic(c); fpu__init_system(c);
fpu__init_system();
/* The final cr0 value is set later, in fpu_init() */ /* The final cr0 value is set later, in fpu_init() */
} }