diff options
| author | Jens Axboe <axboe@kernel.dk> | 2013-07-02 02:31:48 -0400 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2013-07-02 02:31:48 -0400 |
| commit | 5f0e5afa0de4522abb3ea7d1369039b94e740ec5 (patch) | |
| tree | 6a5be3db9ecfed8ef2150c6146f6d1e0d658ac8b /arch/s390/kernel/mcount64.S | |
| parent | d752b2696072ed52fd5afab08b601e2220a3b87e (diff) | |
| parent | 9e895ace5d82df8929b16f58e9f515f6d54ab82d (diff) | |
Merge tag 'v3.10-rc7' into for-3.11/drivers
Linux 3.10-rc7
Pull this in early to avoid doing it with the bcache merge,
since there are a number of changes to bcache between my old
base (3.10-rc1) and the new pull request.
Diffstat (limited to 'arch/s390/kernel/mcount64.S')
| -rw-r--r-- | arch/s390/kernel/mcount64.S | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/s390/kernel/mcount64.S b/arch/s390/kernel/mcount64.S index 11332193db30..1c52eae3396a 100644 --- a/arch/s390/kernel/mcount64.S +++ b/arch/s390/kernel/mcount64.S | |||
| @@ -7,6 +7,7 @@ | |||
| 7 | 7 | ||
| 8 | #include <linux/linkage.h> | 8 | #include <linux/linkage.h> |
| 9 | #include <asm/asm-offsets.h> | 9 | #include <asm/asm-offsets.h> |
| 10 | #include <asm/ftrace.h> | ||
| 10 | 11 | ||
| 11 | .section .kprobes.text, "ax" | 12 | .section .kprobes.text, "ax" |
| 12 | 13 | ||
| @@ -29,6 +30,7 @@ ENTRY(ftrace_caller) | |||
| 29 | stg %r1,__SF_BACKCHAIN(%r15) | 30 | stg %r1,__SF_BACKCHAIN(%r15) |
| 30 | lgr %r2,%r14 | 31 | lgr %r2,%r14 |
| 31 | lg %r3,168(%r15) | 32 | lg %r3,168(%r15) |
| 33 | aghi %r2,-MCOUNT_INSN_SIZE | ||
| 32 | larl %r14,ftrace_trace_function | 34 | larl %r14,ftrace_trace_function |
| 33 | lg %r14,0(%r14) | 35 | lg %r14,0(%r14) |
| 34 | basr %r14,%r14 | 36 | basr %r14,%r14 |