summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2015-04-25 05:27:26 +0200
committerIngo Molnar <mingo@kernel.org>2015-05-19 15:47:38 +0200
commit26b1f5d05a81a0e60eed718d2d073f050b0afc8f (patch)
tree110f58631c3d610d431efe0a1ee5092e5a621dba
parent966ece619eaeae9b5cb6cede7fe6303b7031a51f (diff)
downloadblackbird-op-linux-26b1f5d05a81a0e60eed718d2d073f050b0afc8f.tar.gz
blackbird-op-linux-26b1f5d05a81a0e60eed718d2d073f050b0afc8f.zip
x86/fpu: Make setup_init_fpu_buf() run-once explicitly
Remove the dependency on the init_xstate_buf == NULL check to implement once-per-bootup logic in eager_fpu_init(), by making setup_init_fpu_buf() run once per bootup explicitly. This is in preparation to make init_xstate_buf statically allocated. The various boot-once quirks in the FPU init code will be removed in a later cleanup stage. 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>
-rw-r--r--arch/x86/kernel/fpu/xsave.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/arch/x86/kernel/fpu/xsave.c b/arch/x86/kernel/fpu/xsave.c
index adeab16655ae..d11b33514130 100644
--- a/arch/x86/kernel/fpu/xsave.c
+++ b/arch/x86/kernel/fpu/xsave.c
@@ -565,8 +565,14 @@ void setup_xstate_comp(void)
/*
* setup the xstate image representing the init state
*/
-static void __init setup_init_fpu_buf(void)
+static void setup_init_fpu_buf(void)
{
+ static int on_boot_cpu = 1;
+
+ if (!on_boot_cpu)
+ return;
+ on_boot_cpu = 0;
+
/*
* Setup init_xstate_buf to represent the init state of
* all the features managed by the xsave
@@ -738,8 +744,7 @@ void __init_refok eager_fpu_init(void)
return;
}
- if (!init_xstate_buf)
- setup_init_fpu_buf();
+ setup_init_fpu_buf();
}
/*
OpenPOWER on IntegriCloud