tracing/probes: Avoid setting TPARG_FL_FENTRY and TPARG_FL_RETURN

[linux-2.6-microblaze.git] / kernel / trace / trace_kprobe.c

diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
index 59cda19..867ffb7 100644 (file)
--- a/kernel/trace/trace_kprobe.c
+++ b/kernel/trace/trace_kprobe.c
@@ -825,7 +825,7 @@ static int __trace_kprobe_create(int argc, const char *argv[])
                if (is_return)
                        flags |= TPARG_FL_RETURN;
                ret = kprobe_on_func_entry(NULL, symbol, offset);
-               if (ret == 0)
+               if (ret == 0 && !is_return)
                        flags |= TPARG_FL_FENTRY;
                /* Defer the ENOENT case until register kprobe */
                if (ret == -EINVAL && is_return) {