Merge branch 'x86-fpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull x86 fpu updates from Ingo Molnar:
 "Misc preparatory changes for an upcoming FPU optimization that will
  delay the loading of FPU registers to return-to-userspace"

* 'x86-fpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/fpu: Don't export __kernel_fpu_{begin,end}()
  x86/fpu: Update comment for __raw_xsave_addr()
  x86/fpu: Add might_fault() to user_insn()
  x86/pkeys: Make init_pkru_value static
  x86/thread_info: Remove _TIF_ALLWORK_MASK
  x86/process/32: Remove asm/math_emu.h include
  x86/fpu: Use unsigned long long shift in xfeature_uncompacted_offset()

diff --cc arch/x86/include/asm/efi.h
Simple merge

diff --cc arch/x86/kernel/fpu/xstate.c
index cd3956f,359564b..9cc1084
--- 1/arch/x86/kernel/fpu/xstate.c
--- 2/arch/x86/kernel/fpu/xstate.c
+++ b/arch/x86/kernel/fpu/xstate.c
@@@ -808,10 -808,8 +808,8 @@@ void fpu__resume_cpu(void
   * Given an xstate feature mask, calculate where in the xsave
   * buffer the state is.  Callers should ensure that the buffer
   * is valid.
-  *
-  * Note: does not work for compacted buffers.
   */
 -void *__raw_xsave_addr(struct xregs_state *xsave, int xstate_feature_mask)
 +static void *__raw_xsave_addr(struct xregs_state *xsave, int xstate_feature_mask)
  {
        int feature_nr = fls64(xstate_feature_mask) - 1;
  

diff --cc arch/x86/kernel/process_32.c
Simple merge