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

Commit c0747ad3 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'linux-kselftest-4.19-rc5' of... 

Merge tag 'linux-kselftest-4.19-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest

Pulled kselftest fixes from Shuah:
 "This Kselftest fixes update for 4.9-rc5 consists of:

  -- fixes to build failures
  -- fixes to add missing config files to increase test coverage
  -- fixes to cgroup test and a new cgroup test for memory.oom.group"
parents 7876320f a987785d

Makefile

+1 −13
Original line number Diff line number Diff line
@@ -299,19 +299,7 @@ KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null) 
KERNELVERSION = $(VERSION)$(if $(PATCHLEVEL),.$(PATCHLEVEL)$(if $(SUBLEVEL),.$(SUBLEVEL)))$(EXTRAVERSION)

export VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION



# SUBARCH tells the usermode build what the underlying arch is.  That is set

# first, and if a usermode build is happening, the "ARCH=um" on the command

# line overrides the setting of ARCH below.  If a native build is happening,

# then ARCH is assigned, getting whatever value it gets normally, and

# SUBARCH is subsequently ignored.



SUBARCH := $(shell uname -m | sed -e s/i.86/x86/ -e s/x86_64/x86/ \

				  -e s/sun4u/sparc64/ \

				  -e s/arm.*/arm/ -e s/sa110/arm/ \

				  -e s/s390x/s390/ -e s/parisc64/parisc/ \

				  -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \

				  -e s/sh[234].*/sh/ -e s/aarch64.*/arm64/ \

				  -e s/riscv.*/riscv/)

include scripts/subarch.include



# Cross compiling and selecting different set of gcc/bin-utils

# ---------------------------------------------------------------------------

scripts/subarch.include

0 → 100644
+13 −0
Original line number Diff line number Diff line 
# SUBARCH tells the usermode build what the underlying arch is.  That is set

# first, and if a usermode build is happening, the "ARCH=um" on the command

# line overrides the setting of ARCH below.  If a native build is happening,

# then ARCH is assigned, getting whatever value it gets normally, and

# SUBARCH is subsequently ignored.



SUBARCH := $(shell uname -m | sed -e s/i.86/x86/ -e s/x86_64/x86/ \

				  -e s/sun4u/sparc64/ \

				  -e s/arm.*/arm/ -e s/sa110/arm/ \

				  -e s/s390x/s390/ -e s/parisc64/parisc/ \

				  -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \

				  -e s/sh[234].*/sh/ -e s/aarch64.*/arm64/ \

				  -e s/riscv.*/riscv/)

tools/testing/selftests/android/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ TEST_PROGS := run.sh 


include ../lib.mk



all:

all: khdr

	@for DIR in $(SUBDIRS); do		\

		BUILD_TARGET=$(OUTPUT)/$$DIR;	\

		mkdir $$BUILD_TARGET  -p;	\

tools/testing/selftests/android/ion/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ $(TEST_GEN_FILES): ipcsocket.c ionutils.c 


TEST_PROGS := ion_test.sh



KSFT_KHDR_INSTALL := 1

top_srcdir = ../../../../..

include ../../lib.mk



$(OUTPUT)/ionapp_export: ionapp_export.c ipcsocket.c ionutils.c