Merge tag 'v4.9-rc1' into x86/fpu, to resolve conflict

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 4 insertions, 0 deletions

diff --git a/arch/x86/kernel/fpu/core.c b/arch/x86/kernel/fpu/core.c
index 30f11ab6c07e..52f5684405c1 100644
--- a/arch/x86/kernel/fpu/core.c
+++ b/arch/x86/kernel/fpu/core.c
@@ -12,6 +12,7 @@
 #include <asm/traps.h>
 
 #include <linux/hardirq.h>
+#include <linux/pkeys.h>
 
 #define CREATE_TRACE_POINTS
 #include <asm/trace/fpu.h>
@@ -474,6 +475,9 @@ static inline void copy_init_fpstate_to_fpregs(void)
                 copy_kernel_to_fxregs(&init_fpstate.fxsave);
         else
                 copy_kernel_to_fregs(&init_fpstate.fsave);
+
+        if (boot_cpu_has(X86_FEATURE_OSPKE))
+                copy_init_pkru_to_fpregs();
 }
 
 /*