From 87170ded0657cf4bd2eecea42ed16a6d8e9580eb Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Mon, 7 May 2012 14:21:02 +0200 Subject: [PATCH] --- yaml --- r: 308491 b: refs/heads/master c: d65987a88dc8b182ef933edf93c23cf4233dd8d5 h: refs/heads/master i: 308489: a437c4ec56136f1b20b1cefa221f181b79eabd1c 308487: c1aff9e9db657050f9aa74ed206c6d67f940d604 v: v3 --- [refs] | 2 +- trunk/arch/microblaze/kernel/mcount.S | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 0174f4335b09..7ba0811e3df0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f397c077e114df07bd2b94a16681a04be8d59dff +refs/heads/master: d65987a88dc8b182ef933edf93c23cf4233dd8d5 diff --git a/trunk/arch/microblaze/kernel/mcount.S b/trunk/arch/microblaze/kernel/mcount.S index e7eaa7a8cbd3..fc1e1322ce4c 100644 --- a/trunk/arch/microblaze/kernel/mcount.S +++ b/trunk/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;