diff options
author | 2021-09-05 18:58:05 -0700 | |
---|---|---|
committer | 2021-09-05 18:58:05 -0700 | |
commit | 8be98d2f2a0a262f8bf8a0bc1fdf522b3c7aab17 (patch) | |
tree | a226b265d692d1933c0541802527d8aeb0d469ab /tools/perf/util/scripting-engines/trace-event-python.c | |
parent | Merge branch 'next' into for-linus (diff) | |
parent | Input: adc-keys - drop bogus __refdata annotation (diff) | |
download | wireguard-linux-8be98d2f2a0a262f8bf8a0bc1fdf522b3c7aab17.tar.xz wireguard-linux-8be98d2f2a0a262f8bf8a0bc1fdf522b3c7aab17.zip |
Merge branch 'next' into for-linus
Prepare input updates for 5.15 merge window.
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
-rw-r--r-- | tools/perf/util/scripting-engines/trace-event-python.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/scripting-engines/trace-event-python.c b/tools/perf/util/scripting-engines/trace-event-python.c index c83c2c6564e0..4e4aa4c97ac5 100644 --- a/tools/perf/util/scripting-engines/trace-event-python.c +++ b/tools/perf/util/scripting-engines/trace-event-python.c @@ -1531,7 +1531,7 @@ static void set_table_handlers(struct tables *tables) * Attempt to use the call path root from the call return * processor, if the call return processor is in use. Otherwise, * we allocate a new call path root. This prevents exporting - * duplicate call path ids when both are in use simultaniously. + * duplicate call path ids when both are in use simultaneously. */ if (tables->dbe.crp) tables->dbe.cpr = tables->dbe.crp->cpr; |