From patchwork Wed Sep 15 14:07:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Zijlstra X-Patchwork-Id: 45039 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 1101A385781D for ; Wed, 15 Sep 2021 14:23:14 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:8b0:10b:1236::1]) by sourceware.org (Postfix) with ESMTPS id 1F8FE3857422 for ; Wed, 15 Sep 2021 14:19:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 1F8FE3857422 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: sourceware.org; spf=none smtp.mailfrom=infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Type:MIME-Version:References: Subject:Cc:To:From:Date:Message-ID:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:In-Reply-To; bh=aOSyjY8L3JGEJsTW71NMYw24sGgHMmZonbCxsS9p7Z8=; b=sSLzUg6AJ/rs2CFzGBUqxvqPd5 7beYjiHOtZbxykDDVXPUEJqTJMbAE4lG0fGu9mpIROsKpOxaKb6dLFzT9WWzKXk3mANsbrXcCZt3h BQcysbTKUg7TbpUjTKHZRnfkGJLcihtOebyI3bM18aIzUrwvbd0vwRj/CIjMjRoGLmQGOW6eNumKm oHLkI8Gkiz73PLfw7OVLmSPb72RGdYqKEBnudp1MZzvO/Q7feRIaadAWzrltvWd7QtK/joLqlpWmD KTYE9wbVRrVQCF6srjB70i6tdeSePlsunJGL/mxNaam4cbjGWvsXkRrCJquRyeVai/DLWU+eq3BtT XYPIFQiA==; Received: from j217100.upc-j.chello.nl ([24.132.217.100] helo=noisy.programming.kicks-ass.net) by casper.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1mQVjA-00Fk3l-6Z; Wed, 15 Sep 2021 14:17:40 +0000 Received: from hirez.programming.kicks-ass.net (hirez.programming.kicks-ass.net [192.168.1.225]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (Client did not present a certificate) by noisy.programming.kicks-ass.net (Postfix) with ESMTPS id 25625300C07; Wed, 15 Sep 2021 16:17:30 +0200 (CEST) Received: by hirez.programming.kicks-ass.net (Postfix, from userid 0) id 180EE28B2AE8B; Wed, 15 Sep 2021 16:17:29 +0200 (CEST) Message-ID: <20210915141525.356307673@infradead.org> User-Agent: quilt/0.66 Date: Wed, 15 Sep 2021 16:07:22 +0200 From: Peter Zijlstra To: andrealmeid@collabora.com, tglx@linutronix.de, mingo@redhat.com, dvhart@infradead.org, rostedt@goodmis.org, bigeasy@linutronix.de Subject: [PATCH 12/20] futex: Rename mark_wake_futex() References: <20210915140710.596174479@infradead.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: dave@stgolabs.net, libc-alpha@sourceware.org, peterz@infradead.org, linux-api@vger.kernel.org, linux-kernel@vger.kernel.org, mtk.manpages@gmail.com, kernel@collabora.com, krisman@collabora.com Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" 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) --- kernel/futex/core.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) --- a/kernel/futex/core.c +++ b/kernel/futex/core.c @@ -732,7 +732,7 @@ static void __futex_unqueue(struct futex * 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, unsign 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, un 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, un 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, un /* 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;