diff options
| author | Jonathan Corbet <corbet@lwn.net> | 2018-04-28 01:13:20 +0200 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2018-04-28 01:13:20 +0200 |
| commit | ccf2b067948a8f90fc3d7990c57283e7e404d004 (patch) | |
| tree | 298e69b6f3e1eef45ac50ba68abe3dd175c4dc8c /tools/perf/builtin-script.c | |
| parent | docs/admin-guide/mm: convert plain text cross references to hyperlinks (diff) | |
| parent | Linux 4.17-rc2 (diff) | |
| download | linux-ccf2b067948a8f90fc3d7990c57283e7e404d004.tar.xz linux-ccf2b067948a8f90fc3d7990c57283e7e404d004.zip | |
Merge tag 'v4.17-rc2' into docs-next
Merge -rc2 to pick up the changes to
Documentation/core-api/kernel-api.rst that hit mainline via the
networking tree. In their absence, subsequent patches cannot be
applied.
Diffstat (limited to 'tools/perf/builtin-script.c')
| -rw-r--r-- | tools/perf/builtin-script.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c index 313c42423393..e0a9845b6cbc 100644 --- a/tools/perf/builtin-script.c +++ b/tools/perf/builtin-script.c @@ -657,8 +657,11 @@ static int perf_sample__fprintf_start(struct perf_sample *sample, break; case PERF_RECORD_SWITCH: case PERF_RECORD_SWITCH_CPU_WIDE: - if (has(SWITCH_OUT)) + if (has(SWITCH_OUT)) { ret += fprintf(fp, "S"); + if (sample->misc & PERF_RECORD_MISC_SWITCH_OUT_PREEMPT) + ret += fprintf(fp, "p"); + } default: break; } @@ -2801,11 +2804,11 @@ int find_scripts(char **scripts_array, char **scripts_path_array) for_each_lang(scripts_path, scripts_dir, lang_dirent) { scnprintf(lang_path, MAXPATHLEN, "%s/%s", scripts_path, lang_dirent->d_name); -#ifdef NO_LIBPERL +#ifndef HAVE_LIBPERL_SUPPORT if (strstr(lang_path, "perl")) continue; #endif -#ifdef NO_LIBPYTHON +#ifndef HAVE_LIBPYTHON_SUPPORT if (strstr(lang_path, "python")) continue; #endif |