perf/urgent fixes

Hi Ingo,

Please consider pulling,

- Arnaldo

The following changes since commit 44b11fee51711ca85aa2b121a49bf029d18a3722:

perf/x86/rapl: Enable Broadwell-U RAPL support (2015-05-11 11:52:30 +0200)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git tags/perf-urgent-for-mingo

for you to fetch changes up to 466c1eb07f42bd27825af24d86b46d05e5e350b9:

perf tools: Use getconf to determine number of online CPUs (2015-05-12 18:11:16 -0300)

----------------------------------------------------------------
perf/urgent fixes:

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

- Fix tools/vm build (Andi Kleen).

----------------------------------------------------------------
Andi Kleen (1):
tools: Fix tools/vm build

Will Deacon (1):
perf tools: Use getconf to determine number of online CPUs

 tools/perf/Makefile | 2 +-
 tools/vm/Makefile   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

From: Andi Kleen <[email protected]>

libabikfs.a doesn't exist anymore, so we now need to link with libapi.a.

---
 tools/vm/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

index ac884b65a072..93aadaf7ff63 100644
@@ -3,7 +3,7 @@
 TARGETS=page-types slabinfo page_owner_sort
 
 LIB_DIR = ../lib/api
-LIBS = $(LIB_DIR)/libapikfs.a
+LIBS = $(LIB_DIR)/libapi.a
 
 CC = $(CROSS_COMPILE)gcc
 CFLAGS = -Wall -Wextra -I../lib/

2.1.0

From: Will Deacon <[email protected]>

Parsing /proc/cpuinfo is a fiddly, arch-dependent business and a recent change to get it working for Sparc broke arm and arm64 platforms.

Use sysconf to determine the number of online CPUs only parsing /proc/cpuinfo when sysconf is not available.

---
 tools/perf/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

index c699dc35eef9..d31a7bbd7cee 100644
@@ -24,7 +24,7 @@ unexport MAKEFLAGS
 # (To override it, run 'make JOBS=1' and similar.)
 #
 ifeq ($(JOBS),)
-  JOBS := $(shell egrep -c '^processor|^CPU' /proc/cpuinfo 2>/dev/null)
+  JOBS := $(shell (getconf _NPROCESSORS_ONLN || egrep -c '^processor|^CPU[0-9]' /proc/cpuinfo) 2>/dev/null)
   ifeq ($(JOBS),0)
     JOBS := 1
   endif

2.1.0

Pulled, thanks a lot Arnaldo!

Ingo