Commit-ID: 9fa7266c2f0cdfcb09eacba2d3624bec7df78641 Gitweb: http://git.kernel.org/tip/9fa7266c2f0cdfcb09eacba2d3624bec7df78641 Author: "Jan Beulich" <jbeulich@xxxxxxxxxx> AuthorDate: Thu, 12 Mar 2009 10:34:45 +0000 Commit: Ingo Molnar <mingo@xxxxxxx> CommitDate: Thu, 12 Mar 2009 11:50:39 +0100 x86: remove leftover unwind annotations Impact: cleanup These got left in needlessly when ret_from_fork got simplified. Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx> LKML-Reference: <49B8F355.76E4.0078.0@xxxxxxxxxx> Signed-off-by: Ingo Molnar <mingo@xxxxxxx> --- arch/x86/kernel/entry_64.S | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S index 7ba4621..54866bb 100644 --- a/arch/x86/kernel/entry_64.S +++ b/arch/x86/kernel/entry_64.S @@ -416,7 +416,6 @@ ENTRY(ret_from_fork) GET_THREAD_INFO(%rcx) - CFI_REMEMBER_STATE RESTORE_REST testl $3, CS-ARGOFFSET(%rsp) # from kernel_thread? @@ -428,7 +427,6 @@ ENTRY(ret_from_fork) RESTORE_TOP_OF_STACK %rdi, -ARGOFFSET jmp ret_from_sys_call # go to the SYSRET fastpath - CFI_RESTORE_STATE CFI_ENDPROC END(ret_from_fork) -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html