x86/vdso: Fix rethunk patching for vdso-image-x32.o too

commit 4969d75dd9077e19e175e60f3c5a6c7653252e63 upstream.

In a similar fashion to

  b388e57d4628 ("x86/vdso: Fix rethunk patching for vdso-image-{32,64}.o")

annotate vdso-image-x32.o too for objtool so that it gets annotated
properly and the unused return thunk warning doesn't fire.

Reported-by: kernel test robot <oliver.sang@intel.com>
Closes: https://lore.kernel.org/oe-lkp/202403251454.23df6278-lkp@intel.com
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Link: https://lore.kernel.org/r/202403251454.23df6278-lkp@intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/arch/x86/entry/vdso/Makefile b/arch/x86/entry/vdso/Makefile
index 4ee59121b9053d19bbe8c88781b6e008df3dee9f..73ac5adb0b4c917f30ca0199c3899a69eb1f6ab8 100644 (file)
--- a/arch/x86/entry/vdso/Makefile
+++ b/arch/x86/entry/vdso/Makefile
@@ -37,6 +37,7 @@ KCSAN_SANITIZE_vma.o                  := y
 
 OBJECT_FILES_NON_STANDARD_extable.o            := n
 OBJECT_FILES_NON_STANDARD_vdso-image-32.o      := n
+OBJECT_FILES_NON_STANDARD_vdso-image-x32.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