Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-24 05:02:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

perf/urgent fixes:

Browse Source 
- 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>
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJVUmz+AAoJENZQFvNTUqpAuhcP/Rsgzl3wev3okj3+mYMxBGql
 yfpXZNlviHqX86Rxu+pgRwr7riehftlAxGghqP4qUNCrD9fRx1RjR0V6rAUsuj2b
 4SW3rpgIHgsfrycTsNGcCpu8H2yGN4+b3fyosb+jZaMKgGYOHHCm4Upj8qqQMjSB
 HF1tkpGJBe4gMUzLBAIRl77R5F3VXpqQmv4qUSi0znJ5dJBxFr6QVtoPTYWF4KiR
 2Lo1K4hCbvlbs7Gr1LuDjpSYZvP3ii+7Tr0VXmfT36+h7pkqvYpPXTZoRDiAeMpe
 gjTXwwD9QJHnlJ0VSbKFdpbEX1pDwMOcOq+vjmR0kvIXTbCsnxzQUfL19dDJjp0v
 paW35HOgSaOpnQ2AFwiCOajOXspW/jLRQ4stnEc8+RkLXqS30CDP00c6maQDdS4p
 Iz8JabHKLIaKHOkVrl2j1xBHzO69Ojz9DopYCX69bGh+qP3DF4RF1yQsjcTNC9C7
 ObS+mhB43yN+Shb2CsugorErNcm5W5Ke14aljpxst45Rh6DOKADFv8aLKwz6ym0i
 wDTrXneXpjxKeD4nBuHkZrSllmRoqNO5jm0juDMRVSqjiVpL/z8uGWS3WrOBK45v
 DMmdw9wZAI5nxW+SDZadqSuUxdXDUmI9rziqdl9GsZQ7/6h/sqe7iBa0sCpUNlQ6
 PlCLri0xmMpVweVbs0G8
 =BIA9
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Ingo Molnar 2015-05-13 08:20:18 +02:00
commit a50750d4dc
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/perf/Makefile
View File

@ -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

2
tools/vm/Makefile
View File

@ -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/