From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from hqnvemgate26.nvidia.com ([216.228.121.65]:9200 "EHLO hqnvemgate26.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729453AbgI2V1u (ORCPT ); Tue, 29 Sep 2020 17:27:50 -0400 From: John Hubbard Subject: [PATCH v2 4/8] selftests/vm: minor cleanup: Makefile and gup_test.c Date: Tue, 29 Sep 2020 14:27:43 -0700 Message-ID: <20200929212747.251804-5-jhubbard@nvidia.com> In-Reply-To: <20200929212747.251804-1-jhubbard@nvidia.com> References: <20200929212747.251804-1-jhubbard@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain List-ID: To: Andrew Morton Cc: Jonathan Corbet , =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= , Ralph Campbell , Shuah Khan , LKML , linux-mm@kvack.org, linux-kselftest@vger.kernel.org, linux-doc@vger.kernel.org, linux-s390@vger.kernel.org, John Hubbard A few cleanups that don't deserve separate patches, but that also should not clutter up other functional changes: 1. Remove an unnecessary #include 2. Restore the sorted order of TEST_GEN_FILES. 3. Add -lpthread to the common LDLIBS, as it is harmless and several tests use it. This gets rid of one special rule already. Signed-off-by: John Hubbard --- tools/testing/selftests/vm/Makefile | 10 ++++------ tools/testing/selftests/vm/gup_test.c | 1 - 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/tools/testing/selftests/vm/Makefile b/tools/testing/selftests/= vm/Makefile index 5a3bd0c497b6..2579242386ac 100644 --- a/tools/testing/selftests/vm/Makefile +++ b/tools/testing/selftests/vm/Makefile @@ -21,14 +21,15 @@ MACHINE ?=3D $(shell echo $(uname_M) | sed -e 's/aarch6= 4.*/arm64/') MAKEFLAGS +=3D --no-builtin-rules =20 CFLAGS =3D -Wall -I ../../../../usr/include $(EXTRA_CFLAGS) -LDLIBS =3D -lrt +LDLIBS =3D -lrt -lpthread TEST_GEN_FILES =3D compaction_test TEST_GEN_FILES +=3D gup_test TEST_GEN_FILES +=3D hmm-tests TEST_GEN_FILES +=3D hugepage-mmap TEST_GEN_FILES +=3D hugepage-shm -TEST_GEN_FILES +=3D map_hugetlb +TEST_GEN_FILES +=3D khugepaged TEST_GEN_FILES +=3D map_fixed_noreplace +TEST_GEN_FILES +=3D map_hugetlb TEST_GEN_FILES +=3D map_populate TEST_GEN_FILES +=3D mlock-random-test TEST_GEN_FILES +=3D mlock2-tests @@ -37,7 +38,6 @@ TEST_GEN_FILES +=3D on-fault-limit TEST_GEN_FILES +=3D thuge-gen TEST_GEN_FILES +=3D transhuge-stress TEST_GEN_FILES +=3D userfaultfd -TEST_GEN_FILES +=3D khugepaged =20 ifeq ($(ARCH),x86_64) CAN_BUILD_I386 :=3D $(shell ./../x86/check_cc.sh $(CC) ../x86/trivial_32bi= t_program.c -m32) @@ -76,7 +76,7 @@ TEST_FILES :=3D test_vmalloc.sh KSFT_KHDR_INSTALL :=3D 1 include ../lib.mk =20 -$(OUTPUT)/hmm-tests: LDLIBS +=3D -lhugetlbfs -lpthread +$(OUTPUT)/hmm-tests: LDLIBS +=3D -lhugetlbfs =20 ifeq ($(ARCH),x86_64) BINARIES_32 :=3D $(patsubst %,$(OUTPUT)/%,$(BINARIES_32)) @@ -127,8 +127,6 @@ warn_32bit_failure: endif endif =20 -$(OUTPUT)/userfaultfd: LDLIBS +=3D -lpthread - $(OUTPUT)/mlock-random-test: LDLIBS +=3D -lcap =20 $(OUTPUT)/gup_test: ../../../../mm/gup_test.h diff --git a/tools/testing/selftests/vm/gup_test.c b/tools/testing/selftest= s/vm/gup_test.c index 70db259582c3..4e9f5d0ed0fc 100644 --- a/tools/testing/selftests/vm/gup_test.c +++ b/tools/testing/selftests/vm/gup_test.c @@ -4,7 +4,6 @@ #include #include #include -#include #include #include #include "../../../../mm/gup_test.h" --=20 2.28.0