diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-06-08 19:03:19 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-06-08 19:03:18 -0700 |
| commit | bc2254655174adf0c5cca54937b2969855314eb3 (patch) | |
| tree | 0bd44b2012efbbbb3244dccd19d543018b7f18db /kernel/trace | |
| parent | 9725c4d90bee3b0be78bb1fdc084df1ec08d7d24 (diff) | |
| parent | 2025064255a87606e2da561de77dcd68daf8b26d (diff) | |
Merge "Merge branch 'android-4.4@9bc4622' into branch 'msm-4.4'"
Diffstat (limited to 'kernel/trace')
| -rw-r--r-- | kernel/trace/trace_kprobe.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c index c9956440d0e6..12ea4ea619ee 100644 --- a/kernel/trace/trace_kprobe.c +++ b/kernel/trace/trace_kprobe.c @@ -1471,6 +1471,11 @@ static __init int kprobe_trace_self_tests_init(void) end: release_all_trace_kprobes(); + /* + * Wait for the optimizer work to finish. Otherwise it might fiddle + * with probes in already freed __init text. + */ + wait_for_kprobe_optimizer(); if (warn) pr_cont("NG: Some tests are failed. Please check them.\n"); else |