diff options
| author | Linus Torvalds | 2013-09-11 04:43:23 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2013-09-11 04:43:23 +0200 |
| commit | 442e0973e9273ae8832abd70f52efde8b8326178 (patch) | |
| tree | e2358f77f76143fe0f524c5a0e26cb940972e5c1 /drivers/infiniband | |
| parent | Merge tag 'cris-for-3.12' of git://jni.nu/cris (diff) | |
| parent | x86/jump-label: Show where and what was wrong on errors (diff) | |
| download | kernel-qcow2-linux-442e0973e9273ae8832abd70f52efde8b8326178.tar.gz kernel-qcow2-linux-442e0973e9273ae8832abd70f52efde8b8326178.tar.xz kernel-qcow2-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 'drivers/infiniband')
0 files changed, 0 insertions, 0 deletions