Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp774520pxb; Thu, 23 Sep 2021 10:16:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzd8DalChBLt6b05LeB5j9WXFSyq4iH81a3UgLionIk51xAPgDMT1b3GonZQoa+NH63tdlo X-Received: by 2002:a05:6402:397:: with SMTP id o23mr7061904edv.59.1632417372810; Thu, 23 Sep 2021 10:16:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632417372; cv=none; d=google.com; s=arc-20160816; b=hKVcOKZKDUa8Npndc/rt4/C/upVB7c0f4XTpUrCa12dZv6nbbnZlshepRX13yVG/Y/ 7gs6DAVvHPN08Bt0M62kja30VRJ75zZEmGnmIVg7goZOikMqAg9ZjKQandoT761rwWf7 Tx5vpAa/rKza/IbOEYGyUlUh4Rql18ODDgrjsSsH1aFQMDpGCJ1BpTkOBdr3SREPOFjL dqEKozuURZBsVouNobf7jcZeKMJmrc9bj2giEmdE4SBbRHE78MmoC4zatD2S9vb/WccN RpiaxdrWci5+801yEruVUkeHuNuiye6eM5hHExldz5hl98W6LSg/k9OH0Tq5gGkOwuy9 a/Xg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=4E+l9LMMnDZBy1S8XmWeU74y2DX5eEJ34kGnUkDGOnw=; b=R8PYWvAkTw5RhoVJ+AuEeZihoS4JMR0eajuXHbtSJov6sRyoiwJo+hCiWzCG1xQ7ip SidVwCd3VvKPH9wkBMAGM9RBlEFjxL/yqmzdKMhVstbl2jsHNTYO/HkKW+leaDZlNlFT WKrMNtM2XVwLD8FACUoCeVRoi9XjEA2V01uyjDVWQgKeR0yzUYm9IaHrYrRJc6kTid7i 1NP1n8v+8AT3K33V9K00jsxGmNPgv8adnPwfzclqQaHKYQqQJ5IVfNuYNYK7sIlGYBg9 +PuMQCXaQDnQn1ON/MPftfA0g27BAsUCRlmZ3XwBqARRoOZLzCRMotk1owFgx8WQKGFX ym9w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=collabora.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id js9si7028187ejc.523.2021.09.23.10.15.48; Thu, 23 Sep 2021 10:16:12 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242542AbhIWRN2 (ORCPT + 99 others); Thu, 23 Sep 2021 13:13:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58100 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242517AbhIWRNZ (ORCPT ); Thu, 23 Sep 2021 13:13:25 -0400 Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e3e3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 08C2CC061574; Thu, 23 Sep 2021 10:11:54 -0700 (PDT) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: tonyk) with ESMTPSA id 041D81F44603 From: =?UTF-8?q?Andr=C3=A9=20Almeida?= To: Thomas Gleixner , Ingo Molnar , Peter Zijlstra , Darren Hart , linux-kernel@vger.kernel.org, Steven Rostedt , Sebastian Andrzej Siewior Cc: kernel@collabora.com, krisman@collabora.com, linux-api@vger.kernel.org, libc-alpha@sourceware.org, mtk.manpages@gmail.com, Davidlohr Bueso , Arnd Bergmann , =?UTF-8?q?Andr=C3=A9=20Almeida?= Subject: [PATCH v2 06/22] futex: Rename __unqueue_futex() Date: Thu, 23 Sep 2021 14:10:55 -0300 Message-Id: <20210923171111.300673-7-andrealmeid@collabora.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210923171111.300673-1-andrealmeid@collabora.com> References: <20210923171111.300673-1-andrealmeid@collabora.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Peter Zijlstra In order to prepare introducing these symbols into the global namespace; rename: s/__unqueue_futex/__futex_unqueue/g Signed-off-by: Peter Zijlstra (Intel) Reviewed-by: André Almeida Signed-off-by: André Almeida --- kernel/futex/core.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/kernel/futex/core.c b/kernel/futex/core.c index 63cf0da2e413..88541fba57ea 100644 --- a/kernel/futex/core.c +++ b/kernel/futex/core.c @@ -1470,12 +1470,12 @@ static int futex_lock_pi_atomic(u32 __user *uaddr, struct futex_hash_bucket *hb, } /** - * __unqueue_futex() - Remove the futex_q from its futex_hash_bucket + * __futex_unqueue() - Remove the futex_q from its futex_hash_bucket * @q: The futex_q to unqueue * * The q->lock_ptr must not be NULL and must be held by the caller. */ -static void __unqueue_futex(struct futex_q *q) +static void __futex_unqueue(struct futex_q *q) { struct futex_hash_bucket *hb; @@ -1502,13 +1502,13 @@ static void mark_wake_futex(struct wake_q_head *wake_q, struct futex_q *q) return; get_task_struct(p); - __unqueue_futex(q); + __futex_unqueue(q); /* * The waiting task can free the futex_q as soon as q->lock_ptr = NULL * is written, without taking any locks. This is possible in the event * of a spurious wakeup, for example. A memory barrier is required here * to prevent the following store to lock_ptr from getting ahead of the - * plist_del in __unqueue_futex(). + * plist_del in __futex_unqueue(). */ smp_store_release(&q->lock_ptr, NULL); @@ -1958,7 +1958,7 @@ void requeue_pi_wake_futex(struct futex_q *q, union futex_key *key, { q->key = *key; - __unqueue_futex(q); + __futex_unqueue(q); WARN_ON(!q->rt_waiter); q->rt_waiter = NULL; @@ -2522,7 +2522,7 @@ static int futex_unqueue(struct futex_q *q) spin_unlock(lock_ptr); goto retry; } - __unqueue_futex(q); + __futex_unqueue(q); BUG_ON(q->pi_state); @@ -2539,7 +2539,7 @@ static int futex_unqueue(struct futex_q *q) */ static void futex_unqueue_pi(struct futex_q *q) { - __unqueue_futex(q); + __futex_unqueue(q); BUG_ON(!q->pi_state); put_pi_state(q->pi_state); -- 2.33.0