From e4b840c5a2eee3610d870703d484263226df80cc Mon Sep 17 00:00:00 2001 Message-Id: From: Andy Lutomirski Date: Wed, 22 Nov 2017 07:15:51 -0800 Subject: [PATCH] Fixup for "x86/asm/64: Use a percpu trampoline stack for IDT entries" One of my sync_regs calls was confusing objtool. I'll fold this in to the series next time I refresh it. Signed-off-by: Andy Lutomirski --- arch/x86/entry/entry_64.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S index 2fdd2127e8e9..f1cef194dfba 100644 --- a/arch/x86/entry/entry_64.S +++ b/arch/x86/entry/entry_64.S @@ -1291,8 +1291,8 @@ ENTRY(error_entry) .Lerror_entry_from_usermode_after_swapgs: /* Put us onto the real thread stack. */ - leaq 8(%rsp), %rdi /* pt_regs pointer */ - movq (%rsp), %r12 + popq %r12 /* save return addr in %12 */ + movq %rsp, %rdi /* arg0 = pt_regs pointer */ call sync_regs movq %rax, %rsp /* switch stack */ ENCODE_FRAME_POINTER -- 2.13.6