[PATCH 1/2] x86/xsave: Move xsave initialization to after parsing early parameters

From: Andi Kleen
Date: Sat Mar 11 2017 - 12:31:16 EST


From: Andi Kleen <ak@xxxxxxxxxxxxxxx>

Move the XSAVE initialization code to be after parsing early parameters.
I don't see any reason why the FPU code needs to be initialized that
early, nothing else in the initialization phase uses XSAVE.
This is useful to be able to handle command line parameters in the
XSAVE initialization code.

Signed-off-by: Andi Kleen <ak@xxxxxxxxxxxxxxx>
---
arch/x86/kernel/cpu/common.c | 1 -
arch/x86/kernel/setup.c | 3 +++
2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index 58094a1f9e9d..db16a28d49a1 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -844,7 +844,6 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c)
}

setup_force_cpu_cap(X86_FEATURE_ALWAYS);
- fpu__init_system(c);
}

void __init early_cpu_init(void)
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 4bf0c8926a1c..2a85efc37e1f 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -90,6 +90,7 @@
#include <asm/processor.h>
#include <asm/bugs.h>
#include <asm/kasan.h>
+#include <asm/fpu/internal.h>

#include <asm/vsyscall.h>
#include <asm/cpu.h>
@@ -987,6 +988,8 @@ void __init setup_arch(char **cmdline_p)

parse_early_param();

+ fpu__init_system(&boot_cpu_data);
+
#ifdef CONFIG_MEMORY_HOTPLUG
/*
* Memory used by the kernel cannot be hot-removed because Linux
--
2.9.3