Merge branch 'x86/vdso' into x86/core, to resolve conflict and to prepare for depende...

 Conflicts:
	arch/x86/entry/vdso/Makefile

We also want to change arch/x86/entry/vdso/Makefile in a followup
commit, so merge the trees for this.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --cc arch/x86/Makefile
Simple merge

diff --cc arch/x86/entry/vdso/Makefile
index b80f4bbe4f751cad4eeafcec17c96317f2ee82ea,7a97b17f28b7c503c37c0f6897257bf10942ce82..3ccab61ddedab6bb654eab75d3db66eea6fabf1c
--- 1/arch/x86/entry/vdso/Makefile
--- 2/arch/x86/entry/vdso/Makefile
+++ b/arch/x86/entry/vdso/Makefile
@@@ -34,22 -29,18 +29,21 @@@ obj-y                                      += vma.o extable.
  KASAN_SANITIZE_vma.o                  := y
  UBSAN_SANITIZE_vma.o                  := y
  KCSAN_SANITIZE_vma.o                  := y
 -OBJECT_FILES_NON_STANDARD_vma.o               := n
 -OBJECT_FILES_NON_STANDARD_extable.o   := n
 +
 +OBJECT_FILES_NON_STANDARD_extable.o           := n
 +OBJECT_FILES_NON_STANDARD_vdso-image-32.o     := n
 +OBJECT_FILES_NON_STANDARD_vdso-image-64.o     := n
- OBJECT_FILES_NON_STANDARD_vdso32-setup.o      := n
 +OBJECT_FILES_NON_STANDARD_vma.o                       := n
  
  # vDSO images to build
- vdso_img-$(VDSO64-y)          += 64
- vdso_img-$(VDSOX32-y)         += x32
- vdso_img-$(VDSO32-y)          += 32
+ obj-$(CONFIG_X86_64)          += vdso-image-64.o
+ obj-$(CONFIG_X86_X32_ABI)     += vdso-image-x32.o
+ obj-$(CONFIG_COMPAT_32)               += vdso-image-32.o vdso32-setup.o
  
- obj-$(VDSO32-y)                                += vdso32-setup.o
+ OBJECT_FILES_NON_STANDARD_vdso32-setup.o := n
  
- vobjs := $(foreach F,$(vobjs-y),$(obj)/$F)
- vobjs32 := $(foreach F,$(vobjs32-y),$(obj)/$F)
+ vobjs := $(addprefix $(obj)/, $(vobjs-y))
+ vobjs32 := $(addprefix $(obj)/, $(vobjs32-y))
  
  $(obj)/vdso.o: $(obj)/vdso.so