projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3304c9c
)
x86/asm/entry/64: Add forgotten CFI annotation
author
Denys Vlasenko
<
[email protected]
>
Tue, 7 Apr 2015 16:42:47 +0000
(18:42 +0200)
committer
Ingo Molnar
<
[email protected]
>
Wed, 8 Apr 2015 07:18:36 +0000
(09:18 +0200)
Signed-off-by: Denys Vlasenko <
[email protected]
>
Cc: Alexei Starovoitov <
[email protected]
>
Cc: Andy Lutomirski <
[email protected]
>
Cc: Borislav Petkov <
[email protected]
>
Cc: Brian Gerst <
[email protected]
>
Cc: Frederic Weisbecker <
[email protected]
>
Cc: H. Peter Anvin <
[email protected]
>
Cc: Kees Cook <
[email protected]
>
Cc: Linus Torvalds <
[email protected]
>
Cc: Oleg Nesterov <
[email protected]
>
Cc: Steven Rostedt <
[email protected]
>
Cc: Thomas Gleixner <
[email protected]
>
Cc: Will Drewry <
[email protected]
>
Link:
http://lkml.kernel.org/r/
[email protected]
Signed-off-by: Ingo Molnar <
[email protected]
>
arch/x86/kernel/entry_64.S
patch
|
blob
|
history
diff --git
a/arch/x86/kernel/entry_64.S
b/arch/x86/kernel/entry_64.S
index 4ca03c518ab48551c857cd0c72ac65222823402b..3197f41ce320db2e5eb6fc907738e80bd9ea74de 100644
(file)
--- a/
arch/x86/kernel/entry_64.S
+++ b/
arch/x86/kernel/entry_64.S
@@
-506,6
+506,7
@@
return_from_execve:
1:
/* must use IRET code path (pt_regs->cs may have changed) */
addq $8, %rsp
+ CFI_ADJUST_CFA_OFFSET -8
ZERO_EXTRA_REGS
movq %rax,RAX(%rsp)
jmp int_ret_from_sys_call