From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 27 Dec 2018 01:37:51 +0000 (-0800)
Subject: Merge branch 'x86-fpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=d6e867a6ae13bc02cd01c535764e5b051d26cf28;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'x86-fpu-for-linus' of git://git./linux/kernel/git/tip/tip

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()
---

d6e867a6ae13bc02cd01c535764e5b051d26cf28
diff --cc arch/x86/kernel/fpu/xstate.c
index cd3956fc8158,359564beab5c..9cc108456d0b
--- a/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;