From: Ingo Molnar <mingo@kernel.org>
Date: Tue, 30 Jan 2018 14:08:27 +0000 (+0100)
Subject: Merge tag 'v4.15' into x86/pti, to be able to merge dependent changes
X-Git-Tag: v5.15~9394^2~76
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7e86548e2cc8d308cb75439480f428137151b0de;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'v4.15' into x86/pti, to be able to merge dependent changes

Time has come to switch PTI development over to a v4.15 base - we'll still
try to make sure that all PTI fixes backport cleanly to v4.14 and earlier.

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

7e86548e2cc8d308cb75439480f428137151b0de
diff --cc arch/x86/include/asm/disabled-features.h
index c6a3af1,b027633..33833d1
--- a/arch/x86/include/asm/disabled-features.h
+++ b/arch/x86/include/asm/disabled-features.h
@@@ -69,9 -75,8 +75,9 @@@
  #define DISABLED_MASK13	0
  #define DISABLED_MASK14	0
  #define DISABLED_MASK15	0
- #define DISABLED_MASK16	(DISABLE_PKU|DISABLE_OSPKE|DISABLE_LA57)
+ #define DISABLED_MASK16	(DISABLE_PKU|DISABLE_OSPKE|DISABLE_LA57|DISABLE_UMIP)
  #define DISABLED_MASK17	0
 -#define DISABLED_MASK_CHECK BUILD_BUG_ON_ZERO(NCAPINTS != 18)
 +#define DISABLED_MASK18	0
 +#define DISABLED_MASK_CHECK BUILD_BUG_ON_ZERO(NCAPINTS != 19)
  
  #endif /* _ASM_X86_DISABLED_FEATURES_H */
diff --cc arch/x86/lib/Makefile
index d0a3170,f23934b..69a4739
--- a/arch/x86/lib/Makefile
+++ b/arch/x86/lib/Makefile
@@@ -24,10 -24,9 +24,10 @@@ lib-y := delay.o misc.o cmdline.o cpu.
  lib-y += usercopy_$(BITS).o usercopy.o getuser.o putuser.o
  lib-y += memcpy_$(BITS).o
  lib-$(CONFIG_RWSEM_XCHGADD_ALGORITHM) += rwsem.o
- lib-$(CONFIG_INSTRUCTION_DECODER) += insn.o inat.o
+ lib-$(CONFIG_INSTRUCTION_DECODER) += insn.o inat.o insn-eval.o
  lib-$(CONFIG_RANDOMIZE_BASE) += kaslr.o
  lib-$(CONFIG_RETPOLINE) += retpoline.o
 +OBJECT_FILES_NON_STANDARD_retpoline.o :=y
  
  obj-y += msr.o msr-reg.o msr-reg-export.o hweight.o