diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-24 14:48:30 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-24 14:48:30 +0300 |
| commit | 177d363e720c9a940282a295acbd36c2657cc279 (patch) | |
| tree | 69141a102f050cc2c3cdd621e6fc0a83b318bd19 /arch/x86/include | |
| parent | 2da2ca24a38f0200111e3b8823c08d02cb59d362 (diff) | |
| parent | eab6870fee877258122a042bfd99ee7908c40280 (diff) | |
| download | linux-177d363e720c9a940282a295acbd36c2657cc279.tar.xz | |
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
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/barrier.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/barrier.h b/arch/x86/include/asm/barrier.h index 042b5e892ed1..14de0432d288 100644 --- a/arch/x86/include/asm/barrier.h +++ b/arch/x86/include/asm/barrier.h @@ -38,7 +38,7 @@ static inline unsigned long array_index_mask_nospec(unsigned long index, { unsigned long mask; - asm ("cmp %1,%2; sbb %0,%0;" + asm volatile ("cmp %1,%2; sbb %0,%0;" :"=r" (mask) :"g"(size),"r" (index) :"cc"); |