Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core
This commit is contained in:
Коммит
d524e03207
|
@ -471,13 +471,15 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr)
|
||||||
"1: " _ASM_MOV " (%[parent_old]), %[old]\n"
|
"1: " _ASM_MOV " (%[parent_old]), %[old]\n"
|
||||||
"2: " _ASM_MOV " %[return_hooker], (%[parent_replaced])\n"
|
"2: " _ASM_MOV " %[return_hooker], (%[parent_replaced])\n"
|
||||||
" movl $0, %[faulted]\n"
|
" movl $0, %[faulted]\n"
|
||||||
|
"3:\n"
|
||||||
|
|
||||||
".section .fixup, \"ax\"\n"
|
".section .fixup, \"ax\"\n"
|
||||||
"3: movl $1, %[faulted]\n"
|
"4: movl $1, %[faulted]\n"
|
||||||
|
" jmp 3b\n"
|
||||||
".previous\n"
|
".previous\n"
|
||||||
|
|
||||||
_ASM_EXTABLE(1b, 3b)
|
_ASM_EXTABLE(1b, 4b)
|
||||||
_ASM_EXTABLE(2b, 3b)
|
_ASM_EXTABLE(2b, 4b)
|
||||||
|
|
||||||
: [parent_replaced] "=r" (parent), [old] "=r" (old),
|
: [parent_replaced] "=r" (parent), [old] "=r" (old),
|
||||||
[faulted] "=r" (faulted)
|
[faulted] "=r" (faulted)
|
||||||
|
|
Загрузка…
Ссылка в новой задаче