Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp773171pxb; Thu, 23 Sep 2021 10:14:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyPoANtYdtvr+b4K0eQGLmJWZMOaiVswU3ZCKtREOvvH08EdZeUVCmaID72KeU88LUTswqQ X-Received: by 2002:a05:6402:411:: with SMTP id q17mr6933353edv.35.1632417283743; Thu, 23 Sep 2021 10:14:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632417283; cv=none; d=google.com; s=arc-20160816; b=nHpO1AO6ldZfGr2ZH2oLjLRPzG2PvG/3B3CotEaBoEne9xphK6RtRllGk1Eo2b1H2n JkVQ11MGOoFMmb7Z+ga1+FFPDCBLxU/5KVHwnskXc0X3d+G1LHiYa5NV6vJPc5yuRNYa Um2jkEAJ4ewWHEBwu1EjUBUxRse19FjUXFtI/YcZEFTCCTPW6hwBHCjFYk85s2YkQaW4 H7y3ChSOnxyZSkI+dmxvlz5LIbV3T3voJHfh4Swhrj+dYU11vkcEhK5rZa6LFIfvccls JcMG3YiToWK3iwnW08B+CjJ7Fa9FwuVf+SnZ/5F2fA8Obcpq8VS4JIXkqI1DEajAFB5a CygA== 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=pY+NnoaOXk0yhP/wY7jyDl0sjgyokOxGt259xk4Ly4o=; b=aCOioYLTToI2q+JYuKYcfLwf94RKmem+0CC42qlJ3HoIxp1AD7yMqQXumuO3tvFutT mqxUkfaQoMZNuCPvMFvzAF4NLfHl7ONDjbtyjHY4OYYeZl+lpcEI2Cewrk0/fNS+I6CO qHbi+h8aE995G4y5kNlkphTX9fRRWX8UGu+rFwN8P1bLtf90k78C+bXQRJ9AcXw2iUCr uQWUmXhgw0uHcldqVGdXmPJhE4ulf+JyMvBo2b0vHrYa5v+KSCEzecFWzxAD0GFqLmk7 DNoHibXtu3lSRnDeA4w2SCsDiv+ki6pH/jE08kQTzMNeBaJwzuGFDMzyzsZ/nZU3MxqL lDuA== 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 dg13si729233edb.604.2021.09.23.10.14.18; Thu, 23 Sep 2021 10:14:43 -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 S242557AbhIWRN6 (ORCPT + 99 others); Thu, 23 Sep 2021 13:13:58 -0400 Received: from bhuna.collabora.co.uk ([46.235.227.227]:47100 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242589AbhIWRNw (ORCPT ); Thu, 23 Sep 2021 13:13:52 -0400 Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: tonyk) with ESMTPSA id A49C01F4460D 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 12/22] futex: Rename mark_wake_futex() Date: Thu, 23 Sep 2021 14:11:01 -0300 Message-Id: <20210923171111.300673-13-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/mark_wake_futex/futex_wake_mark/g Signed-off-by: Peter Zijlstra (Intel) Reviewed-by: André Almeida Signed-off-by: André Almeida --- kernel/futex/core.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/kernel/futex/core.c b/kernel/futex/core.c index 30246e63e74b..bcc4aa052f9d 100644 --- a/kernel/futex/core.c +++ b/kernel/futex/core.c @@ -732,7 +732,7 @@ static void __futex_unqueue(struct futex_q *q) * must ensure to later call wake_up_q() for the actual * wakeups to occur. */ -static void mark_wake_futex(struct wake_q_head *wake_q, struct futex_q *q) +static void futex_wake_mark(struct wake_q_head *wake_q, struct futex_q *q) { struct task_struct *p = q->task; @@ -818,7 +818,7 @@ int futex_wake(u32 __user *uaddr, unsigned int flags, int nr_wake, u32 bitset) if (!(this->bitset & bitset)) continue; - mark_wake_futex(&wake_q, this); + futex_wake_mark(&wake_q, this); if (++ret >= nr_wake) break; } @@ -933,7 +933,7 @@ int futex_wake_op(u32 __user *uaddr1, unsigned int flags, u32 __user *uaddr2, ret = -EINVAL; goto out_unlock; } - mark_wake_futex(&wake_q, this); + futex_wake_mark(&wake_q, this); if (++ret >= nr_wake) break; } @@ -947,7 +947,7 @@ int futex_wake_op(u32 __user *uaddr1, unsigned int flags, u32 __user *uaddr2, ret = -EINVAL; goto out_unlock; } - mark_wake_futex(&wake_q, this); + futex_wake_mark(&wake_q, this); if (++op_ret >= nr_wake2) break; } @@ -1489,7 +1489,7 @@ int futex_requeue(u32 __user *uaddr1, unsigned int flags, u32 __user *uaddr2, /* Plain futexes just wake or requeue and are done */ if (!requeue_pi) { if (++task_count <= nr_wake) - mark_wake_futex(&wake_q, this); + futex_wake_mark(&wake_q, this); else requeue_futex(this, hb1, hb2, &key2); continue; -- 2.33.0