diff options
| author |   Jan Beulich <jbeulich@novell.com> | 2009-03-12 10:34:45 +0000 |
|---|---|---|
| committer |   Ingo Molnar <mingo@elte.hu> | 2009-03-12 11:50:39 +0100 |
| commit | 9fa7266c2f0cdfcb09eacba2d3624bec7df78641 (patch) | |
| tree | e50e48cf484dbcd00c133a0488df6d7a8f42b69b /arch/x86/kernel/entry_64.S | |
| parent | Merge branches 'x86/asm', 'x86/debug', 'x86/mm', 'x86/setup', 'x86/urgent' and 'linus' into x86/core (diff) | |
| download | linux-dev-9fa7266c2f0cdfcb09eacba2d3624bec7df78641.tar.xz linux-dev-9fa7266c2f0cdfcb09eacba2d3624bec7df78641.zip | |
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/kernel/entry_64.S')
| -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) 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) |