---

yaml --- r: 308491 b: refs/heads/master c: d65987a h: refs/heads/master i: 308489: a437c4e 308487: c1aff9e v: v3
git-mirror · May 25, 2012 · 87170de · 87170de
1 parent d3e0c88
commit 87170de
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;