diff options
| author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2014-10-08 08:03:08 (GMT) |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2014-10-09 07:14:20 (GMT) |
| commit | 0cccdda8d1512af4d3f6913044e8c8e58e15ef37 (patch) | |
| tree | 8e93043ede994d899a625819cb871684f2cfe1a9 /arch/s390/kernel/mcount.S | |
| parent | 53255c9a4dade6ff2162121430d13aaadb38a69c (diff) | |
| download | linux-0cccdda8d1512af4d3f6913044e8c8e58e15ef37.tar.xz | |
s390/ftrace: simplify enabling/disabling of ftrace_graph_caller
We can simply patch the mask field within the branch relative on
condition instruction at the beginning of the ftrace_graph_caller
code block.
This makes the logic even simpler and we get rid of the displacement
calculation.
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/kernel/mcount.S')
| -rw-r--r-- | arch/s390/kernel/mcount.S | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/s390/kernel/mcount.S b/arch/s390/kernel/mcount.S index 07abe8d..4300ea3 100644 --- a/arch/s390/kernel/mcount.S +++ b/arch/s390/kernel/mcount.S @@ -49,8 +49,7 @@ ENTRY(ftrace_caller) basr %r14,%r1 #ifdef CONFIG_FUNCTION_GRAPH_TRACER # The j instruction gets runtime patched to a nop instruction. -# See ftrace_enable_ftrace_graph_caller. The patched instruction is: -# j .+4 +# See ftrace_enable_ftrace_graph_caller. ENTRY(ftrace_graph_caller) j ftrace_graph_caller_end lg %r2,(STACK_PTREGS_GPRS+14*8)(%r15) |