summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/cpu/perf_event.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-09-10 19:43:23 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-09-10 19:43:23 -0700
commit442e0973e9273ae8832abd70f52efde8b8326178 (patch)
treee2358f77f76143fe0f524c5a0e26cb940972e5c1 /arch/x86/kernel/cpu/perf_event.c
parent8d7551eb1916832f2a5b27346edf24e7b2382f67 (diff)
parentfb40d7a8994a3cc7a1e1c1f3258ea8662a366916 (diff)
downloadblackbird-obmc-linux-442e0973e9273ae8832abd70f52efde8b8326178.tar.gz
blackbird-obmc-linux-442e0973e9273ae8832abd70f52efde8b8326178.zip
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
Diffstat (limited to 'arch/x86/kernel/cpu/perf_event.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud