From: Ingo Molnar <mingo@kernel.org>
Date: Thu, 22 Feb 2024 09:11:38 +0000 (+0100)
Subject: Merge branch 'x86/vdso' into x86/core, to resolve conflict and to prepare for depende... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f14df823a61e45db6a92e1caf552d5ec64e06b1e;p=linux.git

Merge branch 'x86/vdso' into x86/core, to resolve conflict and to prepare for dependent changes

 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>
---

f14df823a61e45db6a92e1caf552d5ec64e06b1e
diff --cc arch/x86/entry/vdso/Makefile
index b80f4bbe4f751,7a97b17f28b7c..3ccab61ddedab
--- a/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