[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <171144781402.10875.1003478569450333151.tip-bot2@tip-bot2>
Date: Tue, 26 Mar 2024 10:10:13 -0000
From: "tip-bot2 for Borislav Petkov (AMD)" <tip-bot2@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: kernel test robot <oliver.sang@...el.com>,
"Borislav Petkov (AMD)" <bp@...en8.de>, x86@...nel.org,
linux-kernel@...r.kernel.org
Subject:
[tip: x86/urgent] x86/vdso: Fix rethunk patching for vdso-image-x32.o too
The following commit has been merged into the x86/urgent branch of tip:
Commit-ID: 4969d75dd9077e19e175e60f3c5a6c7653252e63
Gitweb: https://git.kernel.org/tip/4969d75dd9077e19e175e60f3c5a6c7653252e63
Author: Borislav Petkov (AMD) <bp@...en8.de>
AuthorDate: Tue, 26 Mar 2024 10:47:14 +01:00
Committer: Borislav Petkov (AMD) <bp@...en8.de>
CommitterDate: Tue, 26 Mar 2024 10:47:14 +01:00
x86/vdso: Fix rethunk patching for vdso-image-x32.o too
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@...el.com>
Closes: https://lore.kernel.org/oe-lkp/202403251454.23df6278-lkp@intel.com
Signed-off-by: Borislav Petkov (AMD) <bp@...en8.de>
Link: https://lore.kernel.org/r/202403251454.23df6278-lkp@intel.com
---
arch/x86/entry/vdso/Makefile | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/x86/entry/vdso/Makefile b/arch/x86/entry/vdso/Makefile
index fd63051..3d64bcc 100644
--- a/arch/x86/entry/vdso/Makefile
+++ b/arch/x86/entry/vdso/Makefile
@@ -41,6 +41,7 @@ obj-$(CONFIG_X86_X32_ABI) += vdso-image-x32.o
obj-$(CONFIG_COMPAT_32) += vdso-image-32.o vdso32-setup.o
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
Powered by blists - more mailing lists