• Linus Torvalds's avatar
    Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 9e1909b9
    Linus Torvalds authored
    Pull x86/pti updates from Thomas Gleixner:
     "Another set of melted spectrum updates:
    
       - Iron out the last late microcode loading issues by actually
         checking whether new microcode is present and preventing the CPU
         synchronization to run into a timeout induced hang.
    
       - Remove Skylake C2 from the microcode blacklist according to the
         latest Intel documentation
    
       - Fix the VM86 POPF emulation which traps if VIP is set, but VIF is
         not. Enhance the selftests to catch that kind of issue
    
       - Annotate indirect calls/jumps for objtool on 32bit. This is not a
         functional issue, but for consistency sake its the right thing to
         do.
    
       - Fix a jump label build warning observed on SPARC64 which uses 32bit
         storage for the code location which is casted to 64 bit pointer w/o
         extending it to 64bit first.
    
       - Add two new cpufeature bits. Not really an urgent issue, but
         provides them for both x86 and x86/kvm work. No impact on the
         current kernel"
    
    * 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
      x86/microcode: Fix CPU synchronization routine
      x86/microcode: Attempt late loading only when new microcode is present
      x86/speculation: Remove Skylake C2 from Speculation Control microcode blacklist
      jump_label: Fix sparc64 warning
      x86/speculation, objtool: Annotate indirect calls/jumps for objtool on 32-bit kernels
      x86/vm86/32: Fix POPF emulation
      selftests/x86/entry_from_vm86: Add test cases for POPF
      selftests/x86/entry_from_vm86: Exit with 1 if we fail
      x86/cpufeatures: Add Intel PCONFIG cpufeature
      x86/cpufeatures: Add Intel Total Memory Encryption cpufeature
    9e1909b9
nospec-branch.h 8.51 KB