From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C1DE8C433DF for ; Sat, 17 Oct 2020 23:14:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 930A7208E4 for ; Sat, 17 Oct 2020 23:14:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602976473; bh=iNU4Ovy5Elf8THMdQ4gFcXzeppLE19hDE4DfXbdWJjo=; h=Date:From:To:Subject:In-Reply-To:Reply-To:List-ID:From; b=Z6RX5vO4AWsrs8IiRwZ81w6I9p2Mum4vGSQ/ehjeiqgLoeeD8ngNeY5MzajxWLteH 1sORUfiyWrjPtfo1xgWNZz+kkBcyCk3ErYOy1ybWgq5raWFAO6FEjWlipLzQxedK71 vbXWrmsKi/YR+jCUqMOruhjlTRRxPIwBEjKOivFo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2439897AbgJQXOd (ORCPT ); Sat, 17 Oct 2020 19:14:33 -0400 Received: from mail.kernel.org ([198.145.29.99]:48280 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2439878AbgJQXOc (ORCPT ); Sat, 17 Oct 2020 19:14:32 -0400 Received: from localhost.localdomain (c-73-231-172-41.hsd1.ca.comcast.net [73.231.172.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D20A220EDD; Sat, 17 Oct 2020 23:14:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602976472; bh=iNU4Ovy5Elf8THMdQ4gFcXzeppLE19hDE4DfXbdWJjo=; h=Date:From:To:Subject:In-Reply-To:From; b=Kd4z1YrEnoPaKr8HeUUnRVS6LS4HhEuCoT+VVLgtUqUrRWwSFrxRq03ja+fW3mAvK hZv3UsJlkyE89Wcjf6NV5dEzYvfIQYYfXPqVhyUd6NJ/ERUfqmcNgqg5DhJ/czGc4L svv77y0Gt4CC0zjU9SFSZiomj2WI7/oTFLUz8Ef4= Date: Sat, 17 Oct 2020 16:14:31 -0700 From: Andrew Morton To: akpm@linux-foundation.org, corbet@lwn.net, jglisse@redhat.com, jhubbard@nvidia.com, linux-mm@kvack.org, mm-commits@vger.kernel.org, rcampbell@nvidia.com, shuah@kernel.org, torvalds@linux-foundation.org Subject: [patch 18/40] selftests/vm: minor cleanup: Makefile and gup_test.c Message-ID: <20201017231431.a9u8D_pCE%akpm@linux-foundation.org> In-Reply-To: <20201017161314.88890b87fae7446ccc13c902@linux-foundation.org> User-Agent: s-nail v14.8.16 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org =46rom: John Hubbard Subject: selftests/vm: minor cleanup: Makefile and gup_test.c 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. Link: https://lkml.kernel.org/r/20200929212747.251804-5-jhubbard@nvidia.com Signed-off-by: John Hubbard Cc: J=C3=A9r=C3=B4me Glisse Cc: Jonathan Corbet Cc: Ralph Campbell Cc: Shuah Khan Signed-off-by: Andrew Morton --- tools/testing/selftests/vm/Makefile | 10 ++++------ tools/testing/selftests/vm/gup_test.c | 1 - 2 files changed, 4 insertions(+), 7 deletions(-) --- a/tools/testing/selftests/vm/gup_test.c~selftests-vm-minor-cleanup-make= file-and-gup_testc +++ a/tools/testing/selftests/vm/gup_test.c @@ -4,7 +4,6 @@ #include #include #include -#include #include #include #include "../../../../mm/gup_test.h" --- a/tools/testing/selftests/vm/Makefile~selftests-vm-minor-cleanup-makefi= le-and-gup_testc +++ a/tools/testing/selftests/vm/Makefile @@ -21,14 +21,15 @@ MACHINE ?=3D $(shell echo $(uname_M) | sed 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 _