aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/entry_64.S
diff options
context:
space:
mode:
authorJan Beulich <jbeulich@novell.com>2008-10-30 10:45:36 +0000
committerIngo Molnar <mingo@elte.hu>2008-10-30 19:17:21 +0100
commit1cbd8b3fdcf56a3c39a7596512095c9e33221fa1 (patch)
tree773ec192e2091abc7673682e09c685dba3b8ea44 /arch/x86/kernel/entry_64.S
parentMerge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip (diff)
downloadlinux-dev-1cbd8b3fdcf56a3c39a7596512095c9e33221fa1.tar.xz
linux-dev-1cbd8b3fdcf56a3c39a7596512095c9e33221fa1.zip
x86: add two missing unwind annotations
Impact: improve debuginfo Signed-off-by: Jan Beulich <jbeulich@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.S2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
index b86f332c96a6..ddeeb1052583 100644
--- a/arch/x86/kernel/entry_64.S
+++ b/arch/x86/kernel/entry_64.S
@@ -255,6 +255,7 @@ ENTRY(ret_from_fork)
call schedule_tail
GET_THREAD_INFO(%rcx)
testl $(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT),TI_flags(%rcx)
+ CFI_REMEMBER_STATE
jnz rff_trace
rff_action:
RESTORE_REST
@@ -264,6 +265,7 @@ rff_action:
jnz int_ret_from_sys_call
RESTORE_TOP_OF_STACK %rdi,ARGOFFSET
jmp ret_from_sys_call
+ CFI_RESTORE_STATE
rff_trace:
movq %rsp,%rdi
call syscall_trace_leave