Pull x86 alternatives update from Borislav Petkov:
- Reorganize the alternatives patching mechanism to patch a single
location only once instead of multiple times as it was the case with
the two or three alternative options macros
* tag 'x86_alternatives_for_v7.0_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/alternative: Patch a single alternative location only once
x86/alternative: Use helper functions for patching alternatives