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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8D128C433FE for ; Thu, 10 Nov 2022 03:23:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232244AbiKJDXS (ORCPT ); Wed, 9 Nov 2022 22:23:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37136 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230120AbiKJDXS (ORCPT ); Wed, 9 Nov 2022 22:23:18 -0500 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 908FA2B180 for ; Wed, 9 Nov 2022 19:23:15 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sin.source.kernel.org (Postfix) with ESMTPS id D5C4DCE2083 for ; Thu, 10 Nov 2022 03:23:13 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AB5F6C433D6; Thu, 10 Nov 2022 03:23:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1668050591; bh=C7uvOeJkJg4LXhu/7TaCJ/k9Hc8Qcg2Lrh7g+7HTb0M=; h=Date:To:From:Subject:From; b=KFJeBX5cKl4/jkfKRPGvg9WCqKlFoNVVvtvS6gITsPI8Ncc8uCytPnZ1sOY39JnZ/ LWKcrgtUuH9Mvf1rh5LEtv80NpvxTTMaEob02pkygfSj8IIqjemS+mlXqC9JMo7NKD HdPPQxhTcplWCGyKFjFQsru+/OOzsdm2yDwalsMI= Date: Wed, 09 Nov 2022 19:23:10 -0800 To: mm-commits@vger.kernel.org, shuah@kernel.org, adobriyan@gmail.com, punit.agrawal@bytedance.com, akpm@linux-foundation.org From: Andrew Morton Subject: [nacked] selftests-proc-mark-proc-pid-vm-as-x86_64-only.patch removed from -mm tree Message-Id: <20221110032311.AB5F6C433D6@smtp.kernel.org> Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The quilt patch titled Subject: selftests: proc: mark proc-pid-vm as x86_64 only has been removed from the -mm tree. Its filename was selftests-proc-mark-proc-pid-vm-as-x86_64-only.patch This patch was dropped because it was nacked ------------------------------------------------------ From: Punit Agrawal Subject: selftests: proc: mark proc-pid-vm as x86_64 only Date: Wed, 9 Nov 2022 22:11:04 +0000 The proc-pid-vm test does not have support for architectures other than x86_64. Mark it as such in the Makefile and in the process remove the special casing in the test itself. Link: https://lkml.kernel.org/r/20221109221104.1797802-2-punit.agrawal@bytedance.com Signed-off-by: Punit Agrawal Cc: Alexey Dobriyan Cc: Shuah Khan Signed-off-by: Andrew Morton --- tools/testing/selftests/proc/Makefile | 2 +- tools/testing/selftests/proc/proc-pid-vm.c | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) --- a/tools/testing/selftests/proc/Makefile~selftests-proc-mark-proc-pid-vm-as-x86_64-only +++ a/tools/testing/selftests/proc/Makefile @@ -11,7 +11,6 @@ TEST_GEN_PROGS += fd-001-lookup TEST_GEN_PROGS += fd-002-posix-eq TEST_GEN_PROGS += fd-003-kthread TEST_GEN_PROGS += proc-loadavg-001 -TEST_GEN_PROGS += proc-pid-vm TEST_GEN_PROGS += proc-self-map-files-001 TEST_GEN_PROGS += proc-self-map-files-002 TEST_GEN_PROGS += proc-self-syscall @@ -29,6 +28,7 @@ TEST_GEN_PROGS += proc-multiple-procfs TEST_GEN_PROGS += proc-fsconfig-hidepid TEST_GEN_PROGS_x86_64 += proc-empty-vm +TEST_GEN_PROGS_x86_64 += proc-pid-vm TEST_GEN_PROGS += $(TEST_GEN_PROGS_$(ARCH)) --- a/tools/testing/selftests/proc/proc-pid-vm.c~selftests-proc-mark-proc-pid-vm-as-x86_64-only +++ a/tools/testing/selftests/proc/proc-pid-vm.c @@ -105,7 +105,6 @@ struct elf64_phdr { uint64_t p_align; }; -#ifdef __x86_64__ #define PAGE_SIZE 4096 #define VADDR (1UL << 32) #define MAPS_OFFSET 73 @@ -209,7 +208,6 @@ static int make_exe(const uint8_t *paylo return fd1; } -#endif /* * 0: vsyscall VMA doesn't exist vsyscall=none @@ -225,7 +223,6 @@ static const char str_vsyscall_1[] = static const char str_vsyscall_2[] = "ffffffffff600000-ffffffffff601000 r-xp 00000000 00:00 0 [vsyscall]\n"; -#ifdef __x86_64__ static void sigaction_SIGSEGV(int _, siginfo_t *__, void *___) { _exit(g_vsyscall); @@ -493,9 +490,3 @@ int main(void) return 0; } -#else -int main(void) -{ - return 4; -} -#endif _ Patches currently in -mm which might be from punit.agrawal@bytedance.com are