Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a50750d4 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-urgent-for-mingo' of... 

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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 44b11fee 466c1eb0

tools/perf/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -24,7 +24,7 @@ unexport MAKEFLAGS 
# (To override it, run 'make JOBS=1' and similar.)

# (To override it, run 'make JOBS=1' and similar.)

#

#

ifeq ($(JOBS),)

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)

  ifeq ($(JOBS),0)

    JOBS := 1

    JOBS := 1

  endif

  endif

tools/vm/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -3,7 +3,7 @@ 
TARGETS=page-types slabinfo page_owner_sort

TARGETS=page-types slabinfo page_owner_sort





LIB_DIR = ../lib/api

LIB_DIR = ../lib/api

LIBS = $(LIB_DIR)/libapikfs.a

LIBS = $(LIB_DIR)/libapi.a





CC = $(CROSS_COMPILE)gcc

CC = $(CROSS_COMPILE)gcc

CFLAGS = -Wall -Wextra -I../lib/

CFLAGS = -Wall -Wextra -I../lib/