Commit-ID: 064e51e3c8aee6cfb03ab75e9f9551db3924eb07 Gitweb: http://git.kernel.org/tip/064e51e3c8aee6cfb03ab75e9f9551db3924eb07 Author: Ingo Molnar <mingo@xxxxxxxxxx> AuthorDate: Sat, 25 Apr 2015 08:48:54 +0200 Committer: Ingo Molnar <mingo@xxxxxxxxxx> CommitDate: Tue, 19 May 2015 15:47:42 +0200 x86/fpu: Clean up eager_fpu_init() and rename it to fpu__ctx_switch_init() It's not an xsave specific function anymore, so rename it accordingly and also clean it up a bit: - remove the obsolete __init_refok, as the code paths are not mixed anymore - rename it from eager_fpu_init() to fpu__ctx_switch_init() - remove stray 'return;' - make it static to its only user Reviewed-by: Borislav Petkov <bp@xxxxxxxxx> Cc: Andy Lutomirski <luto@xxxxxxxxxxxxxx> Cc: Dave Hansen <dave.hansen@xxxxxxxxxxxxxxx> Cc: Fenghua Yu <fenghua.yu@xxxxxxxxx> Cc: H. Peter Anvin <hpa@xxxxxxxxx> Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> Cc: Oleg Nesterov <oleg@xxxxxxxxxx> Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx> --- arch/x86/kernel/fpu/init.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/arch/x86/kernel/fpu/init.c b/arch/x86/kernel/fpu/init.c index fa9678f..d6d5820 100644 --- a/arch/x86/kernel/fpu/init.c +++ b/arch/x86/kernel/fpu/init.c @@ -167,7 +167,7 @@ __setup("eagerfpu=", eager_fpu_setup); * setup_init_fpu_buf() is __init and it is OK to call it here because * init_xstate_ctx will be unset only once during boot. */ -void __init_refok eager_fpu_init(void) +static void fpu__ctx_switch_init(void) { WARN_ON(current->thread.fpu.fpstate_active); current_thread_info()->status = 0; @@ -191,10 +191,8 @@ void __init_refok eager_fpu_init(void) printk_once(KERN_INFO "x86/fpu: Using '%s' FPU context switches.\n", eagerfpu == ENABLE ? "eager" : "lazy"); - if (!cpu_has_eager_fpu) { + if (!cpu_has_eager_fpu) stts(); - return; - } } /* @@ -214,7 +212,7 @@ void fpu__init_system(void) mxcsr_feature_mask_init(); fpu__init_system_xstate(); - eager_fpu_init(); + fpu__ctx_switch_init(); } void fpu__cpu_init(void) -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html