tree e2358f77f76143fe0f524c5a0e26cb940972e5c1
parent 8d7551eb1916832f2a5b27346edf24e7b2382f67
parent fb40d7a8994a3cc7a1e1c1f3258ea8662a366916
author Linus Torvalds <torvalds@linux-foundation.org> 1378867403 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1378867403 -0700

Merge branch 'x86/jumplabel' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 jumplabel changes from Peter Anvin:
 "One more x86 tree for this merge window.  This tree improves the
  handling of jump labels, so that most of the time we don't have to do
  a massive initial patching run.

  Furthermore, we will error out of the jump label is not what is
  expected, eg if it has been corrupted or tampered with"

* 'x86/jumplabel' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/jump-label: Show where and what was wrong on errors
  x86/jump-label: Add safety checks to jump label conversions
  x86/jump-label: Do not bother updating nops if they are correct
  x86/jump-label: Use best default nops for inital jump label calls