diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-28 14:38:18 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-28 14:38:18 -0500 |
| commit | 3f26b0c876bbfeed74325ada0329de53efbdf7a6 (patch) | |
| tree | 10001aca5e2ff11e9d84514f8e4fcd050e944513 /tools/perf/tests/fdarray.c | |
| parent | 74efe07bc38c538ba7ac40a895910f4f3bee3152 (diff) | |
| parent | 1572e45a924f254d9570093abde46430c3172e3d (diff) | |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fixes from Ingo Molnar:
"Misc fixes on the kernel and tooling side - nothing in particular
stands out"
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (21 commits)
perf/core: Fix the perf_cpu_time_max_percent check
perf/core: Fix perf_event_enable_on_exec() timekeeping (again)
perf/core: Remove confusing comment and move put_ctx()
perf record: Honor --quiet option properly
perf annotate: Add -q/--quiet option
perf diff: Add -q/--quiet option
perf report: Add -q/--quiet option
perf utils: Check verbose flag properly
perf utils: Add perf_quiet_option()
perf record: Add -a as default target
perf stat: Add -a as default target
perf tools: Fail on using multiple bits long terms without value
perf tools: Move new_term arguments into struct parse_events_term template
perf build: Add special fixdep cleaning rule
perf tools: Replace _SC_NPROCESSORS_CONF with max_present_cpu in cpu_topology_map
perf header: Make build_cpu_topology skip offline/absent CPUs
perf cpumap: Add cpu__max_present_cpu()
perf session: Fix DEBUG=1 build with clang
tools lib traceevent: It's preempt not prempt
perf python: Filter out -specs=/a/b/c from the python binding cc options
...
Diffstat (limited to 'tools/perf/tests/fdarray.c')
| -rw-r--r-- | tools/perf/tests/fdarray.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/tests/fdarray.c b/tools/perf/tests/fdarray.c index a2b5ff9bf83d..bc5982f42dc3 100644 --- a/tools/perf/tests/fdarray.c +++ b/tools/perf/tests/fdarray.c | |||
| @@ -19,7 +19,7 @@ static int fdarray__fprintf_prefix(struct fdarray *fda, const char *prefix, FILE | |||
| 19 | { | 19 | { |
| 20 | int printed = 0; | 20 | int printed = 0; |
| 21 | 21 | ||
| 22 | if (!verbose) | 22 | if (verbose <= 0) |
| 23 | return 0; | 23 | return 0; |
| 24 | 24 | ||
| 25 | printed += fprintf(fp, "\n%s: ", prefix); | 25 | printed += fprintf(fp, "\n%s: ", prefix); |
