]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 24 Jun 2018 11:48:30 +0000 (19:48 +0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 24 Jun 2018 11:48:30 +0000 (19:48 +0800)
commit177d363e720c9a940282a295acbd36c2657cc279
tree69141a102f050cc2c3cdd621e6fc0a83b318bd19
parent2da2ca24a38f0200111e3b8823c08d02cb59d362
parenteab6870fee877258122a042bfd99ee7908c40280
Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 pti fixes from Thomas Gleixner:
 "Two small updates for the speculative distractions:

   - Make it more clear to the compiler that array_index_mask_nospec()
     is not subject for optimizations. It's not perfect, but ...

   - Don't report XEN PV guests as vulnerable because their mitigation
     state depends on the hypervisor. Report unknown and refer to the
     hypervisor requirement"

* 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/spectre_v1: Disable compiler optimizations over array_index_mask_nospec()
  x86/pti: Don't report XenPV as vulnerable