Merge 'x86/alternatives'

Pick up dependent changes.

Signed-off-by: Borislav Petkov <bp@suse.de>

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/entry/entry_32.S
Simple merge

diff --cc arch/x86/include/asm/smap.h
Simple merge

diff --cc arch/x86/kernel/alternative.c
Simple merge

diff --cc arch/x86/kernel/kvmclock.c
Simple merge

diff --cc arch/x86/xen/enlighten_pv.c
Simple merge