diff options
| author | Alexander van Heukelum <heukelum@mailshack.com> | 2008-07-22 12:14:16 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-24 06:33:38 -0400 |
| commit | e0a5a5d9b006fd441e61685a051fa85d52fb172c (patch) | |
| tree | f0560b252e099f3c5917b8a99f0cf4ba9bc29916 | |
| parent | 338b9bb3adac0d2c5a1e180491d9b001d624c402 (diff) | |
x86, 64-bit, dwarf2: push pushes 8 bytes and popf pops 8
The CFI_ADJUST_CFA_OFFSET dwarf2 annotation of a push/popf
pair in ret_from_fork wrongly used a value of 4. It should
have been 8. Fix that.
Signed-off-by: Alexander van Heukelum <heukelum@fastmail.fm>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: heukelum@fastmail.fm
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| -rw-r--r-- | arch/x86/kernel/entry_64.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S index 89434d439605..cf3a0b2d0059 100644 --- a/arch/x86/kernel/entry_64.S +++ b/arch/x86/kernel/entry_64.S | |||
| @@ -275,9 +275,9 @@ ENTRY(native_usergs_sysret64) | |||
| 275 | ENTRY(ret_from_fork) | 275 | ENTRY(ret_from_fork) |
| 276 | CFI_DEFAULT_STACK | 276 | CFI_DEFAULT_STACK |
| 277 | push kernel_eflags(%rip) | 277 | push kernel_eflags(%rip) |
| 278 | CFI_ADJUST_CFA_OFFSET 4 | 278 | CFI_ADJUST_CFA_OFFSET 8 |
| 279 | popf # reset kernel eflags | 279 | popf # reset kernel eflags |
| 280 | CFI_ADJUST_CFA_OFFSET -4 | 280 | CFI_ADJUST_CFA_OFFSET -8 |
| 281 | call schedule_tail | 281 | call schedule_tail |
| 282 | GET_THREAD_INFO(%rcx) | 282 | GET_THREAD_INFO(%rcx) |
| 283 | testl $(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT),TI_flags(%rcx) | 283 | testl $(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT),TI_flags(%rcx) |