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;
From:   Yejune Deng <yejune.deng@gmail.com>
To:     mingo@redhat.com, peterz@infradead.org, juri.lelli@redhat.com,
        vincent.guittot@linaro.org, dietmar.eggemann@arm.com,
        rostedt@goodmis.org, bsegall@google.com, mgorman@suse.de,
        bristot@redhat.com
Cc:     linux-kernel@vger.kernel.org, Yejune Deng <yejune.deng@gmail.com>
Subject: [PATCH] sched/fair: use inclusive language in fair sched
Date:   Tue,  8 Jun 2021 18:18:29 +0800
Message-Id: <1623147509-31073-1-git-send-email-yejune.deng@gmail.com>
Precedence: bulk

This patch replaces some non-inclusive terms based on the proposal
that accepted by Linus.
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=49decddd39e5f6132ccd7d9fdc3d7c470b0061bb

Signed-off-by: Yejune Deng <yejune.deng@gmail.com>
---
 kernel/sched/fair.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index 5d0d113..af438d0 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -5760,13 +5760,13 @@ static void record_wakee(struct task_struct *p)
  */
 static int wake_wide(struct task_struct *p)
 {
-	unsigned int master = current->wakee_flips;
-	unsigned int slave = p->wakee_flips;
+	unsigned int primary = current->wakee_flips;
+	unsigned int secondary = p->wakee_flips;
 	int factor = __this_cpu_read(sd_llc_size);
 
-	if (master < slave)
-		swap(master, slave);
-	if (slave < factor || master < slave * factor)
+	if (primary < secondary)
+		swap(primary, secondary);
+	if (secondary < factor || primary < secondary * factor)
 		return 0;
 	return 1;
 }
-- 
2.7.4