diff options
| author | Michal Simek <monstr@monstr.eu> | 2012-05-07 14:21:02 +0200 |
|---|---|---|
| committer | Michal Simek <monstr@monstr.eu> | 2012-05-25 06:34:35 +0200 |
| commit | d65987a88dc8b182ef933edf93c23cf4233dd8d5 (patch) | |
| tree | bf89bd10520302bc2de01f4fce13068f8a80daae /arch | |
| parent | microblaze: Port OOM changes to do_page_fault (diff) | |
| download | linux-d65987a88dc8b182ef933edf93c23cf4233dd8d5.tar.xz linux-d65987a88dc8b182ef933edf93c23cf4233dd8d5.zip | |
microblaze: ftrace: Pass the first calling instruction for dynamic ftrace
Selftest for dynamic ftrace requres to pass address of the first
calling instruction because hash function is calculated from it.
ftrace_update_ftrace_func setups pointer to function which is called
in _mcount function. trace_selftest is not aware about instruction
size (for microblaze 8 - imm and addik) and that's why we have
to pass in r5 address of imm not addik which is in r15.12
For more info look at ftrace_ops_list_func/ftrace.c.
Signed-off-by: Michal Simek <monstr@monstr.eu>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/microblaze/kernel/mcount.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/microblaze/kernel/mcount.S b/arch/microblaze/kernel/mcount.S index e7eaa7a8cbd3..fc1e1322ce4c 100644 --- a/arch/microblaze/kernel/mcount.S +++ b/arch/microblaze/kernel/mcount.S @@ -138,7 +138,7 @@ NOALIGN_ENTRY(ftrace_call) #endif /* CONFIG_DYNAMIC_FTRACE */ /* static normal trace */ lwi r6, r1, 120; /* MS: load parent addr */ - addik r5, r15, 0; /* MS: load current function addr */ + addik r5, r15, -4; /* MS: load current function addr */ /* MS: here is dependency on previous code */ brald r15, r20; /* MS: jump to ftrace handler */ nop; |