From patchwork Fri Oct 6 10:32:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 149184 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a888:0:b0:403:3b70:6f57 with SMTP id x8csp221582vqo; Fri, 6 Oct 2023 03:32:36 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFDM8tJhFMQ5QBX/FJMrhWwXj/qaW6Iqv7ZJmieE71W01iealDCR61MT/ZG6Engdl+llmbj X-Received: by 2002:a05:6358:5289:b0:13a:4f34:8063 with SMTP id g9-20020a056358528900b0013a4f348063mr7841632rwa.32.1696588356743; Fri, 06 Oct 2023 03:32:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696588356; cv=none; d=google.com; s=arc-20160816; b=qwdb9hJQsaSa81EzJHZDL8LihZ3rF7FGhC1c5qRakw3bXJS2SPl9ik+OMuXX3dEJEA oiSioqBWa7kCqmwc+j5JvMLxtlzfDPCBEyT6jQBXaqqZ/0kEekxx/l73KCd9T8wFxy7O hZ+sPvpn4pFRcLjr7RhquV8uSeGq5SpcZs92Htqu8lLpXVa8wWjA19wIOM6bnUqs5EhW YT0MXIEwbw9KdSyH55F46q27qrRblHAijEXz1/sRbXAJuvH7cMtyOHB7hZ/KdqeqVXKf EcT84droBlBv/vTA4AMTAAiTtqFrVnd6Mm4DqQ9P+xODLEuqkz5nqBuJNE1/WEJanNaV ny9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=yVisgtQNVzDiyDauoPwFi6xuBYYibbumtylUKxIkQlQ=; fh=Z0kMDyFf2DK5UmRqwKb0uAHwR2KW5i1L2UEE33AHBWI=; b=catHbxrGzSGTY5rKxmIIEuS71v0YRmr9QOdl7/3/r6FFoG1ROLq4a2Z9bm4CxLaHv0 tB+nbYIUsJ/noxxCFXUq4VItIiBcrzttRHSXXpNhlJVzU9RYsbYZ8nsVf43IXW/HCr6V zaJ+Py8LmzgLjPlb9Y2Jqty2D6xiGUYQXRAq30rv+VrOo7Fa64VLefsyfnbX9XrBKyf8 c2Y4kVRVO7KeQT++XMiuJOWVTD0ghwvqevV5gMy+cSXc+DhAI0lHLv1juiOkHzezftAB 1npfL2mpXfC9EDtbHsaaLIfsachhRe0iPUPNkQyeJK8obfKj0eXVXl5obGQET8LT9cfZ lHMw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=Xc6RXRYO; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=8np5eGw1; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from howler.vger.email (howler.vger.email. [23.128.96.34]) by mx.google.com with ESMTPS id mm16-20020a17090b359000b0025bb4a1c12esi3435121pjb.148.2023.10.06.03.32.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 03:32:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=Xc6RXRYO; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=8np5eGw1; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id 5807D8042847; Fri, 6 Oct 2023 03:32:34 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231707AbjJFKc0 (ORCPT + 18 others); Fri, 6 Oct 2023 06:32:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33464 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231497AbjJFKcY (ORCPT ); Fri, 6 Oct 2023 06:32:24 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D51CC9F; Fri, 6 Oct 2023 03:32:22 -0700 (PDT) Date: Fri, 06 Oct 2023 10:32:20 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1696588341; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yVisgtQNVzDiyDauoPwFi6xuBYYibbumtylUKxIkQlQ=; b=Xc6RXRYORtjK8XNwF2CR1+c/UYrzJxy3BVA0BcX0D7vdfdFD3YXN7RyMCqRHgg2CBv6BDZ uPmiTxcDZYr/0gor8mNium3OfoEg2KphHjTuZMuet8p5bF64T+loRPj6KhFKHDqCCzJklK afi8oIJjLEEszRaEWJmncvVpBTD+GKnD/i5NKu770o6rEM3qXiq8u1v2u2ccp0OJeliGwM F+WlsbS+5JPoyRCW9kFGz+ArHW2S0e9Yma2LHDdZYT2kWyv7yDuYVFrK3E+u6fBKcvHLAS c77kJrn55/xQNGBuNxB0KUuYbB77EfqI54I9KQe49e4H7FRHTCk8RvnkYG50mQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1696588341; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yVisgtQNVzDiyDauoPwFi6xuBYYibbumtylUKxIkQlQ=; b=8np5eGw1eehkSGHQZ1XoP/ea5knFSWqF6KuqnfYZOFKmVnuUDXfSixZnAPIMvYggYO7sl8 jJTcbnwPAZVRatBg== From: "tip-bot2 for Muhammad Usama Anjum" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: locking/core] locking/futex/selftests: Remove duplicate ABI defines Cc: Muhammad Usama Anjum , Ingo Molnar , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20231006095539.1601385-1-usama.anjum@collabora.com> References: <20231006095539.1601385-1-usama.anjum@collabora.com> MIME-Version: 1.0 Message-ID: <169658834039.3135.4395839213523782496.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=2.7 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on howler.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Fri, 06 Oct 2023 03:32:34 -0700 (PDT) X-Spam-Level: ** X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779001832832565814 X-GMAIL-MSGID: 1779001832832565814 The following commit has been merged into the locking/core branch of tip: Commit-ID: d351a9e56cc90a9ff694550e4b3bcaf51a391525 Gitweb: https://git.kernel.org/tip/d351a9e56cc90a9ff694550e4b3bcaf51a391525 Author: Muhammad Usama Anjum AuthorDate: Fri, 06 Oct 2023 14:55:37 +05:00 Committer: Ingo Molnar CommitterDate: Fri, 06 Oct 2023 12:29:45 +02:00 locking/futex/selftests: Remove duplicate ABI defines Kselftests are kernel tests that are built with kernel headers from the same source version. The kernel headers, which includes current ABI definitions, are already being included correctly in the futex selftest Makefile with the help of KHDR_INCLUDE, no need to define them again. Remove duplicate ABI definitions, which is effectively dead code. No functional changes intended. Signed-off-by: Muhammad Usama Anjum Signed-off-by: Ingo Molnar Link: https://lore.kernel.org/r/20231006095539.1601385-1-usama.anjum@collabora.com --- tools/testing/selftests/futex/include/futextest.h | 22 +-------------- 1 file changed, 22 deletions(-) diff --git a/tools/testing/selftests/futex/include/futextest.h b/tools/testing/selftests/futex/include/futextest.h index ddbcfc9..59f66af 100644 --- a/tools/testing/selftests/futex/include/futextest.h +++ b/tools/testing/selftests/futex/include/futextest.h @@ -25,28 +25,6 @@ typedef volatile u_int32_t futex_t; #define FUTEX_INITIALIZER 0 -/* Define the newer op codes if the system header file is not up to date. */ -#ifndef FUTEX_WAIT_BITSET -#define FUTEX_WAIT_BITSET 9 -#endif -#ifndef FUTEX_WAKE_BITSET -#define FUTEX_WAKE_BITSET 10 -#endif -#ifndef FUTEX_WAIT_REQUEUE_PI -#define FUTEX_WAIT_REQUEUE_PI 11 -#endif -#ifndef FUTEX_CMP_REQUEUE_PI -#define FUTEX_CMP_REQUEUE_PI 12 -#endif -#ifndef FUTEX_WAIT_REQUEUE_PI_PRIVATE -#define FUTEX_WAIT_REQUEUE_PI_PRIVATE (FUTEX_WAIT_REQUEUE_PI | \ - FUTEX_PRIVATE_FLAG) -#endif -#ifndef FUTEX_REQUEUE_PI_PRIVATE -#define FUTEX_CMP_REQUEUE_PI_PRIVATE (FUTEX_CMP_REQUEUE_PI | \ - FUTEX_PRIVATE_FLAG) -#endif - /** * futex() - SYS_futex syscall wrapper * @uaddr: address of first futex