x86, vdso: Move the 32-bit vdso special pages after the text

This unifies the vdso mapping code and teaches it how to map special
pages at addresses corresponding to symbols in the vdso image.  The
new code is used for all vdso variants, but so far only the 32-bit
variants use the new vvar page position.

Signed-off-by: Andy Lutomirski <luto@amacapital.net>
Link: http://lkml.kernel.org/r/b6d7858ad7b5ac3fd3c29cab6d6d769bc45d195e.1399317206.git.luto@amacapital.net
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

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

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

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

diff --cc arch/x86/vdso/vdso-layout.lds.S
Simple merge

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

diff --cc arch/x86/vdso/vdso2c.h
Simple merge

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

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