]>
Commit | Line | Data |
---|---|---|
00e5a55c BS |
1 | From: jbeulich@novell.com |
2 | Subject: fix unwind annotations | |
3 | Patch-mainline: tbd | |
4 | ||
5 | Automatically created from "patches.arch/x86_64-unwind-annotations" by xen-port-patches.py | |
6 | ||
7 | Index: head-2008-10-24/arch/x86/kernel/entry_64-xen.S | |
8 | =================================================================== | |
9 | --- head-2008-10-24.orig/arch/x86/kernel/entry_64-xen.S 2008-10-24 10:51:58.000000000 +0200 | |
10 | +++ head-2008-10-24/arch/x86/kernel/entry_64-xen.S 2008-10-24 10:52:01.000000000 +0200 | |
11 | @@ -303,12 +303,13 @@ NMI_MASK = 0x80000000 | |
12 | ENTRY(ret_from_fork) | |
13 | CFI_DEFAULT_STACK | |
14 | push kernel_eflags(%rip) | |
15 | - CFI_ADJUST_CFA_OFFSET 4 | |
16 | + CFI_ADJUST_CFA_OFFSET 8 | |
17 | popf # reset kernel eflags | |
18 | - CFI_ADJUST_CFA_OFFSET -4 | |
19 | + CFI_ADJUST_CFA_OFFSET -8 | |
20 | call schedule_tail | |
21 | GET_THREAD_INFO(%rcx) | |
22 | testl $(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT),TI_flags(%rcx) | |
23 | + CFI_REMEMBER_STATE | |
24 | jnz rff_trace | |
25 | rff_action: | |
26 | RESTORE_REST | |
27 | @@ -318,6 +319,7 @@ rff_action: | |
28 | jnz int_ret_from_sys_call | |
29 | RESTORE_TOP_OF_STACK %rdi,ARGOFFSET | |
30 | jmp ret_from_sys_call | |
31 | + CFI_RESTORE_STATE | |
32 | rff_trace: | |
33 | movq %rsp,%rdi | |
34 | call syscall_trace_leave |