x86, vdso: Patch alternatives in the 32-bit VDSO

We need the alternatives mechanism for rdtsc_barrier() to work.

Signed-off-by: Stefani Seibold <stefani@seibold.net>
Link: http://lkml.kernel.org/r/1395094933-14252-9-git-send-email-stefani@seibold.net
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

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

diff --cc arch/x86/vdso/Makefile
Simple merge

diff --cc arch/x86/vdso/vdso32-setup.c
Simple merge

diff --cc arch/x86/vdso/vma.c
Simple merge