diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-05-17 01:57:31 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-05-17 01:57:31 -0400 |
| commit | 75d95d84888cbd0024eb62ca7e72b3f7fe67dbdd (patch) | |
| tree | 7167fa30a5c46766c10c4b9a37d7bf9373c26c6d /tools/perf | |
| parent | 52648e83c9a6b9f7fc3dd272d4d10175e93aa62a (diff) | |
| parent | c0655fe9b0901a968800f56687be3c62b4cce5d2 (diff) | |
Merge branch 'linus' into x86/asm, to resolve conflicts
Conflicts:
tools/testing/selftests/x86/Makefile
tools/testing/selftests/x86/run_x86_tests.sh
Diffstat (limited to 'tools/perf')
| -rw-r--r-- | tools/perf/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/Makefile b/tools/perf/Makefile index c699dc35eef9..d31a7bbd7cee 100644 --- a/tools/perf/Makefile +++ b/tools/perf/Makefile | |||
| @@ -24,7 +24,7 @@ unexport MAKEFLAGS | |||
| 24 | # (To override it, run 'make JOBS=1' and similar.) | 24 | # (To override it, run 'make JOBS=1' and similar.) |
| 25 | # | 25 | # |
| 26 | ifeq ($(JOBS),) | 26 | ifeq ($(JOBS),) |
| 27 | JOBS := $(shell egrep -c '^processor|^CPU' /proc/cpuinfo 2>/dev/null) | 27 | JOBS := $(shell (getconf _NPROCESSORS_ONLN || egrep -c '^processor|^CPU[0-9]' /proc/cpuinfo) 2>/dev/null) |
| 28 | ifeq ($(JOBS),0) | 28 | ifeq ($(JOBS),0) |
| 29 | JOBS := 1 | 29 | JOBS := 1 |
| 30 | endif | 30 | endif |