From: Michal Simek Date: Mon, 7 May 2012 12:21:02 +0000 (+0200) Subject: microblaze: ftrace: Pass the first calling instruction for dynamic ftrace X-Git-Tag: v3.5-rc1~61^2~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d65987a88dc8b182ef933edf93c23cf4233dd8d5;p=platform%2Fkernel%2Flinux-exynos.git 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 --- diff --git a/arch/microblaze/kernel/mcount.S b/arch/microblaze/kernel/mcount.S index e7eaa7a..fc1e132 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;