On Sat, Mar 14, 2015 at 04:13:34PM +0100, Oleg Nesterov wrote: > Now that eager_fpu_init_bp() does setup_init_fpu_buf() and nothing else > we can remove it and move this code into its "caller", eager_fpu_init(). > > This avoids the confusing games with "static __refdata void (*boot_func)". > init_xstate_buf can be NULL only on boot, so it is safe to the "__init" > setup_init_fpu_buf() function, just we need to add the "__init_refok" > marker. > > Signed-off-by: Oleg Nesterov <o...@redhat.com>
Applied, thanks. I added a note above eager_fpu_init() why it is marked as __init_refok: --- From: Oleg Nesterov <o...@redhat.com> Date: Sat, 14 Mar 2015 16:13:34 +0100 Subject: [PATCH] x86/fpu: Kill eager_fpu_init_bp() Now that eager_fpu_init_bp() does setup_init_fpu_buf() only and nothing else, we can remove it and move this code into its "caller", eager_fpu_init(). This avoids the confusing games with "static __refdata void (*boot_func)": init_xstate_buf can be NULL only during boot, so it is safe to call the __init-annotated setup_init_fpu_buf() function in eager_fpu_init(), we just need to mark it as __init_refok. Signed-off-by: Oleg Nesterov <o...@redhat.com> Cc: Dave Hansen <dave.han...@intel.com> Cc: Ingo Molnar <mi...@kernel.org> Cc: Andy Lutomirski <l...@amacapital.net> Cc: Linus Torvalds <torva...@linux-foundation.org> Cc: Pekka Riikonen <priik...@iki.fi> Cc: Rik van Riel <r...@redhat.com> Cc: Suresh Siddha <sbsid...@gmail.com> Cc: Fenghua Yu <fenghua...@intel.com> Cc: Quentin Casasnovas <quentin.casasno...@oracle.com> Link: http://lkml.kernel.org/r/20150314151334.gc13...@redhat.com Signed-off-by: --- arch/x86/kernel/xsave.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/arch/x86/kernel/xsave.c b/arch/x86/kernel/xsave.c index ada8df7b89c0..87a815b85f3e 100644 --- a/arch/x86/kernel/xsave.c +++ b/arch/x86/kernel/xsave.c @@ -678,16 +678,12 @@ void xsave_init(void) this_func(); } -static inline void __init eager_fpu_init_bp(void) -{ - if (!init_xstate_buf) - setup_init_fpu_buf(); -} - -void eager_fpu_init(void) +/* + * setup_init_fpu_buf() is __init and it is OK to call it here because + * init_xstate_buf will be unset only once during boot. + */ +void __init_refok eager_fpu_init(void) { - static __refdata void (*boot_func)(void) = eager_fpu_init_bp; - WARN_ON(used_math()); current_thread_info()->status = 0; @@ -699,10 +695,8 @@ void eager_fpu_init(void) return; } - if (boot_func) { - boot_func(); - boot_func = NULL; - } + if (!init_xstate_buf) + setup_init_fpu_buf(); } /* -- 2.3.3 -- Regards/Gruss, Boris. ECO tip #101: Trim your mails when you reply. -- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
