Browse Source

x86/fpu: Remove the extra fpu__detect() layer

Now that fpu__detect() has become an empty layer around
fpu__init_system(), eliminate it and make fpu__init_system()
the main system initialization routine.

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>
Ingo Molnar 10 years ago
parent
commit
c66e3f2823
3 changed files with 1 additions and 8 deletions
  1. 0 1
      arch/x86/include/asm/processor.h
  2. 1 1
      arch/x86/kernel/cpu/common.c
  3. 0 6
      arch/x86/kernel/fpu/init.c

+ 0 - 1
arch/x86/include/asm/processor.h

@@ -167,7 +167,6 @@ extern const struct seq_operations cpuinfo_op;
 #define cache_line_size()	(boot_cpu_data.x86_cache_alignment)
 #define cache_line_size()	(boot_cpu_data.x86_cache_alignment)
 
 
 extern void cpu_detect(struct cpuinfo_x86 *c);
 extern void cpu_detect(struct cpuinfo_x86 *c);
-extern void fpu__detect(struct cpuinfo_x86 *c);
 
 
 extern void early_cpu_init(void);
 extern void early_cpu_init(void);
 extern void identify_boot_cpu(void);
 extern void identify_boot_cpu(void);

+ 1 - 1
arch/x86/kernel/cpu/common.c

@@ -758,7 +758,7 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c)
 	cpu_detect(c);
 	cpu_detect(c);
 	get_cpu_vendor(c);
 	get_cpu_vendor(c);
 	get_cpu_cap(c);
 	get_cpu_cap(c);
-	fpu__detect(c);
+	fpu__init_system(c);
 
 
 	if (this_cpu->c_early_init)
 	if (this_cpu->c_early_init)
 		this_cpu->c_early_init(c);
 		this_cpu->c_early_init(c);

+ 0 - 6
arch/x86/kernel/fpu/init.c

@@ -231,9 +231,3 @@ static int __init no_387(char *s)
 }
 }
 
 
 __setup("no387", no_387);
 __setup("no387", no_387);
-
-void fpu__detect(struct cpuinfo_x86 *c)
-{
-	fpu__init_system(c);
-	/* The final cr0 value is set later, in fpu_init() */
-}