tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent

Pull perf/urgent fixes from Arnaldo Carvalho de Melo:

- Use getconf to determine number of online CPUs,
fixing the build on ARM (Will Deacon)

- Fix tools/vm build (Andi Kleen).

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>

Ingo Molnar a50750d4 44b11fee

+2 -2
+1 -1
tools/perf/Makefile
··· 24 24 # (To override it, run 'make JOBS=1' and similar.) 25 25 # 26 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 28 ifeq ($(JOBS),0) 29 29 JOBS := 1 30 30 endif
+1 -1
tools/vm/Makefile
··· 3 3 TARGETS=page-types slabinfo page_owner_sort 4 4 5 5 LIB_DIR = ../lib/api 6 - LIBS = $(LIB_DIR)/libapikfs.a 6 + LIBS = $(LIB_DIR)/libapi.a 7 7 8 8 CC = $(CROSS_COMPILE)gcc 9 9 CFLAGS = -Wall -Wextra -I../lib/