Merge branch 'x86-alternatives-for-linus' of git://git.kernel.org/pub/scm/linux/kerne...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 6 Mar 2019 16:45:46 +0000 (08:45 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 6 Mar 2019 16:45:46 +0000 (08:45 -0800)
commit6ea98b4baa1c9089d7a035ebccb993e03d1ac57f
tree095d5037d8f686517646c33a48658b0ae22d1431
parent45802da05e666a81b421422d3e302930c0e24e77
parent093ae8f9a86a974c920b613860f1f7fd5bbd70ab
Merge branch 'x86-alternatives-for-linus' of git://git./linux/kernel/git/tip/tip

Pull x86 alternative instruction updates from Ingo Molnar:
 "Small RDTSCP opimization, enabled by the newly added ALTERNATIVE_3(),
  and other small improvements"

* 'x86-alternatives-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/TSC: Use RDTSCP
  x86/alternatives: Add an ALTERNATIVE_3() macro
  x86/alternatives: Print containing function
  x86/alternatives: Add macro comments
arch/x86/kernel/alternative.c