diff options
author | Jan Beulich <jbeulich@novell.com> | 2009-03-12 06:34:45 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-03-12 06:50:39 -0400 |
commit | 9fa7266c2f0cdfcb09eacba2d3624bec7df78641 (patch) | |
tree | e50e48cf484dbcd00c133a0488df6d7a8f42b69b /arch/x86 | |
parent | a98fe7f3425c6b4e90de16f8da63b0429a8fed08 (diff) |
x86: remove leftover unwind annotations
Impact: cleanup
These got left in needlessly when ret_from_fork got simplified.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
LKML-Reference: <49B8F355.76E4.0078.0@novell.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86')
-rw-r--r-- | 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 7ba4621c0dfa..54866bb5d38c 100644 --- a/arch/x86/kernel/entry_64.S +++ b/arch/x86/kernel/entry_64.S | |||
@@ -416,7 +416,6 @@ ENTRY(ret_from_fork) | |||
416 | 416 | ||
417 | GET_THREAD_INFO(%rcx) | 417 | GET_THREAD_INFO(%rcx) |
418 | 418 | ||
419 | CFI_REMEMBER_STATE | ||
420 | RESTORE_REST | 419 | RESTORE_REST |
421 | 420 | ||
422 | testl $3, CS-ARGOFFSET(%rsp) # from kernel_thread? | 421 | testl $3, CS-ARGOFFSET(%rsp) # from kernel_thread? |
@@ -428,7 +427,6 @@ ENTRY(ret_from_fork) | |||
428 | RESTORE_TOP_OF_STACK %rdi, -ARGOFFSET | 427 | RESTORE_TOP_OF_STACK %rdi, -ARGOFFSET |
429 | jmp ret_from_sys_call # go to the SYSRET fastpath | 428 | jmp ret_from_sys_call # go to the SYSRET fastpath |
430 | 429 | ||
431 | CFI_RESTORE_STATE | ||
432 | CFI_ENDPROC | 430 | CFI_ENDPROC |
433 | END(ret_from_fork) | 431 | END(ret_from_fork) |
434 | 432 | ||