Commit 7cf22a1c authored by Harish's avatar Harish Committed by Linus Torvalds
Browse files

selftests/vm: fix building protection keys test 

Commit d8cbe8bf ("tools/testing/selftests/vm: fix build error") tried
to include a ARCH check for powerpc, however ARCH is not defined in the
Makefile before including lib.mk.  This makes test building to skip on
both x86 and powerpc.

Fix the arch check by replacing it using machine type as it is already
defined and used in the test.

Link: https://lkml.kernel.org/r/20201215100402.257376-1-harish@linux.ibm.com


Fixes: d8cbe8bf ("tools/testing/selftests/vm: fix build error")
Signed-off-by: default avatarHarish <harish@linux.ibm.com>
Reviewed-by: default avatarSandipan Das <sandipan@linux.ibm.com>
Cc: Shuah Khan <shuah@kernel.org>
Cc: Sandipan Das <sandipan@linux.ibm.com>
Cc: John Hubbard <jhubbard@nvidia.com>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent dea8dcf2

tools/testing/selftests/vm/Makefile

+5 −5
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
include local_config.mk



uname_M := $(shell uname -m 2>/dev/null || echo not)

MACHINE ?= $(shell echo $(uname_M) | sed -e 's/aarch64.*/arm64/')

MACHINE ?= $(shell echo $(uname_M) | sed -e 's/aarch64.*/arm64/' -e 's/ppc64.*/ppc64/')



# Without this, failed build products remain, with up-to-date timestamps,

# thus tricking Make (and you!) into believing that All Is Well, in subsequent
@@ -43,7 +43,7 @@ TEST_GEN_FILES += thuge-gen 
TEST_GEN_FILES += transhuge-stress

TEST_GEN_FILES += userfaultfd



ifeq ($(ARCH),x86_64)

ifeq ($(MACHINE),x86_64)

CAN_BUILD_I386 := $(shell ./../x86/check_cc.sh $(CC) ../x86/trivial_32bit_program.c -m32)

CAN_BUILD_X86_64 := $(shell ./../x86/check_cc.sh $(CC) ../x86/trivial_64bit_program.c)

CAN_BUILD_WITH_NOPIE := $(shell ./../x86/check_cc.sh $(CC) ../x86/trivial_program.c -no-pie)
@@ -65,13 +65,13 @@ TEST_GEN_FILES += $(BINARIES_64) 
endif

else



ifneq (,$(findstring $(ARCH),powerpc))

ifneq (,$(findstring $(MACHINE),ppc64))

TEST_GEN_FILES += protection_keys

endif



endif



ifneq (,$(filter $(MACHINE),arm64 ia64 mips64 parisc64 ppc64 ppc64le riscv64 s390x sh64 sparc64 x86_64))

ifneq (,$(filter $(MACHINE),arm64 ia64 mips64 parisc64 ppc64 riscv64 s390x sh64 sparc64 x86_64))

TEST_GEN_FILES += va_128TBswitch

TEST_GEN_FILES += virtual_address_range

TEST_GEN_FILES += write_to_hugetlbfs
@@ -84,7 +84,7 @@ TEST_FILES := test_vmalloc.sh 
KSFT_KHDR_INSTALL := 1

include ../lib.mk



ifeq ($(ARCH),x86_64)

ifeq ($(MACHINE),x86_64)

BINARIES_32 := $(patsubst %,$(OUTPUT)/%,$(BINARIES_32))

BINARIES_64 := $(patsubst %,$(OUTPUT)/%,$(BINARIES_64))