From be6781a36c808b91b819e4d42ecd8cd69329736c Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Wed, 18 Jul 2012 19:15:25 +0100
Subject: [PATCH] --- yaml --- r: 321101 b: refs/heads/master c:
 4c36595ec87115f2f876f7d4fdec8ca284a42b9c h: refs/heads/master i:   321099:
 88eaefef0ad227c62df3847c20274b42387e9cd9 v: v3

---
 [refs]                         |  2 +-
 trunk/arch/arm/kernel/ftrace.c | 17 +++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index be7310e2e92d..5870d23adb12 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a76d7bd96d65fa5119adba97e1b58d95f2e78829
+refs/heads/master: 4c36595ec87115f2f876f7d4fdec8ca284a42b9c
diff --git a/trunk/arch/arm/kernel/ftrace.c b/trunk/arch/arm/kernel/ftrace.c
index df0bf0c8cb79..34e56647dcee 100644
--- a/trunk/arch/arm/kernel/ftrace.c
+++ b/trunk/arch/arm/kernel/ftrace.c
@@ -179,19 +179,20 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr,
 	old = *parent;
 	*parent = return_hooker;
 
-	err = ftrace_push_return_trace(old, self_addr, &trace.depth,
-				       frame_pointer);
-	if (err == -EBUSY) {
-		*parent = old;
-		return;
-	}
-
 	trace.func = self_addr;
+	trace.depth = current->curr_ret_stack + 1;
 
 	/* Only trace if the calling function expects to */
 	if (!ftrace_graph_entry(&trace)) {
-		current->curr_ret_stack--;
 		*parent = old;
+		return;
+	}
+
+	err = ftrace_push_return_trace(old, self_addr, &trace.depth,
+				       frame_pointer);
+	if (err == -EBUSY) {
+		*parent = old;
+		return;
 	}
 }