From: Linus Torvalds Date: Mon, 20 Jan 2014 22:46:32 +0000 (-0800) Subject: Merge branch 'x86/mpx' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip X-Git-Tag: v3.14-rc1~155 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c9cdd9a6ae49704f12a289706551536ec842693f;p=platform%2Fkernel%2Flinux-stable.git Merge branch 'x86/mpx' of git://git./linux/kernel/git/tip/tip Pull x86 cpufeature and mpx updates from Peter Anvin: "This includes the basic infrastructure for MPX (Memory Protection Extensions) support, but does not include MPX support itself. It is, however, a prerequisite for KVM support for MPX, which I believe will be pushed later this merge window by the KVM team. This includes moving the functionality in futex_atomic_cmpxchg_inatomic() into a new function in uaccess.h so it can be reused - this will be used by the final MPX patches. The actual MPX functionality (map management and so on) will be pushed in a future merge window, when ready" * 'x86/mpx' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/intel/mpx: Remove unused LWP structure x86, mpx: Add MPX related opcodes to the x86 opcode map x86: replace futex_atomic_cmpxchg_inatomic() with user_atomic_cmpxchg_inatomic x86: add user_atomic_cmpxchg_inatomic at uaccess.h x86, xsave: Support eager-only xsave features, add MPX support x86, cpufeature: Define the Intel MPX feature flag --- c9cdd9a6ae49704f12a289706551536ec842693f