diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-05-31 12:02:43 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-05-31 12:02:43 +0800 |
| commit | a898540914d4136f29bc738ce593c1c501006f23 (patch) | |
| tree | 9440b7f76c029143611c89ed919718ba6ff353f4 /kernel/trace/trace.c | |
| parent | d97f745e1d2fea4d2f308e5e06eee81a9a84f3f5 (diff) | |
| parent | 56d847e3ef9433d7ac92376e4ba49d3cf3cb70d2 (diff) | |
Merge tag 'v4.1.40' into linux-linaro-lsk-v4.1lsk-v4.1-17.06lsk-v4.1-17.05linux-linaro-lsk-v4.1
This is the 4.1.40 stable release
Diffstat (limited to 'kernel/trace/trace.c')
| -rw-r--r-- | kernel/trace/trace.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 61ea7e8cdde5..a4c0ae70c6dd 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -6025,11 +6025,13 @@ ftrace_trace_snapshot_callback(struct ftrace_hash *hash, return ret; out_reg: - ret = register_ftrace_function_probe(glob, ops, count); + ret = alloc_snapshot(&global_trace); + if (ret < 0) + goto out; - if (ret >= 0) - alloc_snapshot(&global_trace); + ret = register_ftrace_function_probe(glob, ops, count); + out: return ret < 0 ? ret : 0; } |