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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 699B2C43603 for ; Tue, 10 Dec 2019 04:07:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3ED7720726 for ; Tue, 10 Dec 2019 04:07:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575950865; bh=AIlYt7FH70CT7CO7G2+IY2nMcziboljsxBgveRaGOfo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Cq1JagQHRLoXCOPzrxJpKHU/a4zg+gwCrd+3k9QqL+w8QywMEraPLBIq59j/kNmdi vgqmmwFZnLzLOWGGlo9LTlyI0cCBixig4HRmfNeKIMvM/XS5Q0D4lGs8tQJOBCGdC2 srfBjLKweXqycZqcrFkJHyBY2awpTpkRsXqRclyw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726777AbfLJEHp (ORCPT ); Mon, 9 Dec 2019 23:07:45 -0500 Received: from mail.kernel.org ([198.145.29.99]:43218 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726619AbfLJEHo (ORCPT ); Mon, 9 Dec 2019 23:07:44 -0500 Received: from paulmck-ThinkPad-P72.home (199-192-87-166.static.wiline.com [199.192.87.166]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5C0442071E; Tue, 10 Dec 2019 04:07:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575950864; bh=AIlYt7FH70CT7CO7G2+IY2nMcziboljsxBgveRaGOfo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KvSsBoCE7Nt71AlMOHPYTXFKAbGP36a2kGuo6AbualIANkjhXvugeaRMcrhVUmXkE IXvMzE9UnHGQlJjkaYvPs1bZhSb/mBEFip7zXkV/5wtjge2/o1ENhVFOXGyY+YM6wA 4YJ5R2DDxx6ZyXOLguA1pa203aMH9bGwwNNG3mc8= From: paulmck@kernel.org To: rcu@vger.kernel.org Cc: linux-kernel@vger.kernel.org, kernel-team@fb.com, mingo@kernel.org, jiangshanlai@gmail.com, dipankar@in.ibm.com, akpm@linux-foundation.org, mathieu.desnoyers@efficios.com, josh@joshtriplett.org, tglx@linutronix.de, peterz@infradead.org, rostedt@goodmis.org, dhowells@redhat.com, edumazet@google.com, fweisbec@gmail.com, oleg@redhat.com, joel@joelfernandes.org, "Paul E. McKenney" , Bart Van Assche , Christoph Hellwig , Hannes Reinecke , Johannes Thumshirn , Shane M Seymour , "Martin K . Petersen" Subject: [PATCH tip/core/rcu 01/12] rcu: Remove rcu_swap_protected() Date: Mon, 9 Dec 2019 20:07:30 -0800 Message-Id: <20191210040741.2943-1-paulmck@kernel.org> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20191210040714.GA2715@paulmck-ThinkPad-P72> References: <20191210040714.GA2715@paulmck-ThinkPad-P72> Sender: rcu-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: rcu@vger.kernel.org From: "Paul E. McKenney" Now that the calls to rcu_swap_protected() have been replaced by rcu_replace_pointer(), this commit removes rcu_swap_protected(). Link: https://lore.kernel.org/lkml/CAHk-=wiAsJLw1egFEE=Z7-GGtM6wcvtyytXZA1+BHqta4gg6Hw@mail.gmail.com/ Reported-by: Linus Torvalds Signed-off-by: Paul E. McKenney Cc: Bart Van Assche Cc: Christoph Hellwig Cc: Hannes Reinecke Cc: Johannes Thumshirn Cc: Shane M Seymour Cc: Martin K. Petersen --- include/linux/rcupdate.h | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h index 0b75063..fe47024 100644 --- a/include/linux/rcupdate.h +++ b/include/linux/rcupdate.h @@ -401,22 +401,6 @@ do { \ }) /** - * rcu_swap_protected() - swap an RCU and a regular pointer - * @rcu_ptr: RCU pointer - * @ptr: regular pointer - * @c: the conditions under which the dereference will take place - * - * Perform swap(@rcu_ptr, @ptr) where @rcu_ptr is an RCU-annotated pointer and - * @c is the argument that is passed to the rcu_dereference_protected() call - * used to read that pointer. - */ -#define rcu_swap_protected(rcu_ptr, ptr, c) do { \ - typeof(ptr) __tmp = rcu_dereference_protected((rcu_ptr), (c)); \ - rcu_assign_pointer((rcu_ptr), (ptr)); \ - (ptr) = __tmp; \ -} while (0) - -/** * rcu_access_pointer() - fetch RCU pointer with no dereferencing * @p: The pointer to read * -- 2.9.5