Messages in this thread Patch in this message | | | Date | Fri, 20 May 2022 11:00:46 -0000 | From | "tip-bot2 for Peter Zijlstra" <> | Subject | [tip: x86/tdx] x86/tdx: Fix RETs in TDX asm |
| |
The following commit has been merged into the x86/tdx branch of tip:
Commit-ID: c796f02162e428b595ff70196dca161ee46b163b Gitweb: https://git.kernel.org/tip/c796f02162e428b595ff70196dca161ee46b163b Author: Peter Zijlstra <peterz@infradead.org> AuthorDate: Fri, 20 May 2022 10:38:39 +02:00 Committer: Borislav Petkov <bp@suse.de> CommitterDate: Fri, 20 May 2022 12:53:22 +02:00
x86/tdx: Fix RETs in TDX asm
Because build-testing is over-rated, fix a few trivial objtool complaints:
vmlinux.o: warning: objtool: __tdx_module_call+0x3e: missing int3 after ret vmlinux.o: warning: objtool: __tdx_hypercall+0x6e: missing int3 after ret
Fixes: eb94f1b6a70a ("x86/tdx: Add __tdx_module_call() and __tdx_hypercall() helper functions") Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Signed-off-by: Borislav Petkov <bp@suse.de> Link: https://lore.kernel.org/r/20220520083839.GR2578@worktop.programming.kicks-ass.net --- arch/x86/coco/tdx/tdcall.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/coco/tdx/tdcall.S b/arch/x86/coco/tdx/tdcall.S index eeb4511..f9eb113 100644 --- a/arch/x86/coco/tdx/tdcall.S +++ b/arch/x86/coco/tdx/tdcall.S @@ -73,7 +73,7 @@ SYM_FUNC_START(__tdx_module_call) FRAME_BEGIN TDX_MODULE_CALL host=0 FRAME_END - ret + RET SYM_FUNC_END(__tdx_module_call) /* @@ -196,7 +196,7 @@ SYM_FUNC_START(__tdx_hypercall) FRAME_END - retq + RET .Lpanic: call __tdx_hypercall_failed /* __tdx_hypercall_failed never returns */
| |