From patchwork Sat Nov 19 01:34:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 23175 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp511062wrr; Fri, 18 Nov 2022 17:55:41 -0800 (PST) X-Google-Smtp-Source: AA0mqf6rAsjtb60uifNkfokqwC5Qh5l9ONoTzwNgCexvyefwyxFOUlKk5li4wyTL1o9yWO9kNNoQ X-Received: by 2002:a65:6d18:0:b0:477:2abc:d4a7 with SMTP id bf24-20020a656d18000000b004772abcd4a7mr5508375pgb.306.1668822941448; Fri, 18 Nov 2022 17:55:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668822941; cv=none; d=google.com; s=arc-20160816; b=qDuFkEcB9I093e34SB7IgUq2WTJIB0f4mrbhTKasFZulBonWwS1UwFfmVdM81Pa6Nj D3/iR/UT/v1nqex2C/cZvPhAjK7lAqLJ+D6tK3wdkk2ICuEHnA1LKNISTa0h335tpYQC QoyYyL/8SsPkq8uHqIDY13WNXPoor416h4Saa3uo5OowIGBxH7St6g8ivrxtob2nX/yv eBNDnCIZlw41rBFmuFwK2aWk3TW3qAWHFWta9wbzAAHUxm3ufEPqnD/5kgfuI9+5jOoF 9Hz/S+oO9PVSZB3zxbHuhu1YB7cUaEGJ5WmI6dUPcU90+XMcoecmZchHNT46Lqd/RGTh Y13w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:reply-to:dkim-signature; bh=tD2ZlexlcX0KfmQHE0mJ5LR6ZJYKnXIf8Otqhyd2XwU=; b=PQ1e0ueuiuI2tLAsmyJP+qoMenkNHf6YvkBawuUgaNGnR6nvzZAJ9suO2OzM44OReM 1FjzX2LKJbaQhKIPzxgbwINHsv2lB+UiyIlvOyijtP2lkBHyRvGk9U69gOnMji0aIR+D lnaB3EuB3PgqUJy5+GP+hkpAJ7aX9G7tJFXSrT1V4Ct/Qj0Euh1AxUYo3G7c1TM0hl5V t1kBbBfQGIAa0+l3gX8Qu7gcOtS9jTDe2SRaNrQ6tYjscjLt5lRTilkTNWUHkAdkPm7k GTJvt9gQtWEj5retqHWElUnr6kCX6YRyWxnWeekkWw06RfaD/PFA3qU4JNq6AtP8Rl+a rBbg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=MB9MhSdw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w184-20020a6230c1000000b00571d4ca44ddsi4625189pfw.333.2022.11.18.17.55.27; Fri, 18 Nov 2022 17:55:41 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=MB9MhSdw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231475AbiKSByF (ORCPT + 99 others); Fri, 18 Nov 2022 20:54:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53188 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232177AbiKSBwq (ORCPT ); Fri, 18 Nov 2022 20:52:46 -0500 Received: from mail-pg1-x549.google.com (mail-pg1-x549.google.com [IPv6:2607:f8b0:4864:20::549]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 66E63C5600 for ; Fri, 18 Nov 2022 17:35:05 -0800 (PST) Received: by mail-pg1-x549.google.com with SMTP id q194-20020a632acb000000b00476fda6a1d2so3944530pgq.15 for ; Fri, 18 Nov 2022 17:35:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=tD2ZlexlcX0KfmQHE0mJ5LR6ZJYKnXIf8Otqhyd2XwU=; b=MB9MhSdwME1l5f01zL+yqUNJf3WE7Wu0+w8g0OhQMoRgcdFNMiEl2Posb3nwOUuTuD +tDRTwe89VCBh4TUUBZYFwPkQegSk7I3pM8hr0OWMKYHJXHnIW5iyWHzAp1baiIvkL+M xvWAhhFwW2Yf1Gj5279lBpactxhKOCQ0IEInrZiBKCsvP5jjloBw2bf5pvCQbaP/a02E HctMjGFpVqM0zObrPX67hF9ozKCMkdYoLheziBuZphT1nqQ1b2UPE5GWbP6p2+JrfcJy 4NPgcWYf4DFDp2d5yS3j2Vy/fKpDMxIRtkJbIs7JiWbVyohddhm+ah4g1/MDsxL6xsfT dFHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=tD2ZlexlcX0KfmQHE0mJ5LR6ZJYKnXIf8Otqhyd2XwU=; b=Lc8ZHx5NaoI8FHCkHJP8tph2Nel8OOIj+6vATq+eWz2uKCXYguDw2S9R90Gu+q1zeF wUEGezHHIxxNmTrsE9l8ziIzMzBalfumkiztuhET61qv5nfpV7T9TqQR7by9QxRygc/T h2UsK8rLur1Sg+HL57jLb6H3gvRMX4b3guvQza6OCExrgU8FlAb6ji9HyqXhLGjVjA1/ Fi9WtZpOTHrybN9ZRYJZDZd0Jhb05uWAsCqU5Lla6y/VNEc202+8ezR8mQt8lPBah4n4 DQTPAdDM2ys3d5HghM33Qqbqqjj5f8PTjenuAhGdsqGuI+qVfBNcCJYmT9+7lVHW9xzs 7PkA== X-Gm-Message-State: ANoB5pneFeFFLK8USzVs8bL8QSRjd5hltYhkyFFCez6nc1b86UyeD6MP PzOnqiVkM5QXqP6+zf/GmBPQaL+UYKI= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a62:16d4:0:b0:572:6b5f:bdc2 with SMTP id 203-20020a6216d4000000b005726b5fbdc2mr10383566pfw.36.1668821704620; Fri, 18 Nov 2022 17:35:04 -0800 (PST) Reply-To: Sean Christopherson Date: Sat, 19 Nov 2022 01:34:48 +0000 In-Reply-To: <20221119013450.2643007-1-seanjc@google.com> Mime-Version: 1.0 References: <20221119013450.2643007-1-seanjc@google.com> X-Mailer: git-send-email 2.38.1.584.g0f3c55d4c2-goog Message-ID: <20221119013450.2643007-8-seanjc@google.com> Subject: [PATCH 7/9] tools: Drop conflicting non-atomic test_and_{clear,set}_bit() helpers From: Sean Christopherson To: Yury Norov , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Marc Zyngier , Paolo Bonzini Cc: Andy Shevchenko , Rasmus Villemoes , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , James Morse , Alexandru Elisei , Suzuki K Poulose , Oliver Upton , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, Sean Christopherson X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749887684851948822?= X-GMAIL-MSGID: =?utf-8?q?1749887684851948822?= Drop tools' non-atomic test_and_set_bit() and test_and_clear_bit() helpers now that all users are gone. The names will be claimed in the future for atomic versions. Signed-off-by: Sean Christopherson --- tools/include/linux/bitmap.h | 34 ---------------------------------- 1 file changed, 34 deletions(-) diff --git a/tools/include/linux/bitmap.h b/tools/include/linux/bitmap.h index 65d0747c5205..f3566ea0f932 100644 --- a/tools/include/linux/bitmap.h +++ b/tools/include/linux/bitmap.h @@ -77,40 +77,6 @@ static inline void bitmap_or(unsigned long *dst, const unsigned long *src1, __bitmap_or(dst, src1, src2, nbits); } -/** - * test_and_set_bit - Set a bit and return its old value - * @nr: Bit to set - * @addr: Address to count from - */ -static inline int test_and_set_bit(int nr, unsigned long *addr) -{ - unsigned long mask = BIT_MASK(nr); - unsigned long *p = ((unsigned long *)addr) + BIT_WORD(nr); - unsigned long old; - - old = *p; - *p = old | mask; - - return (old & mask) != 0; -} - -/** - * test_and_clear_bit - Clear a bit and return its old value - * @nr: Bit to clear - * @addr: Address to count from - */ -static inline int test_and_clear_bit(int nr, unsigned long *addr) -{ - unsigned long mask = BIT_MASK(nr); - unsigned long *p = ((unsigned long *)addr) + BIT_WORD(nr); - unsigned long old; - - old = *p; - *p = old & ~mask; - - return (old & mask) != 0; -} - /** * bitmap_zalloc - Allocate bitmap * @nbits: Number of bits