[tip: sched/core] sched/core: Combine separate 'else' and 'if' statements
From: tip-bot2 for Liang Luo
Date: Tue Jun 09 2026 - 04:34:54 EST
The following commit has been merged into the sched/core branch of tip:
Commit-ID: 76124a050ddbc8b252172205ab04f10a83c03a4d
Gitweb: https://git.kernel.org/tip/76124a050ddbc8b252172205ab04f10a83c03a4d
Author: Liang Luo <luoliang@xxxxxxxxxx>
AuthorDate: Mon, 08 Jun 2026 15:18:42 +08:00
Committer: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
CommitterDate: Tue, 09 Jun 2026 10:28:08 +02:00
sched/core: Combine separate 'else' and 'if' statements
The kernel coding style recommends using 'else if' instead of
placing 'if' on a separate line after 'else'. This change makes
the code consistent with the rest of the kernel codebase.
Signed-off-by: Liang Luo <luoliang@xxxxxxxxxx>
Signed-off-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx>
Link: https://patch.msgid.link/20260608071842.325159-1-luoliang@xxxxxxxxxx
---
kernel/sched/core.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index e745c58..2f4530e 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -3816,8 +3816,7 @@ ttwu_do_activate(struct rq *rq, struct task_struct *p, int wake_flags,
en_flags |= ENQUEUE_RQ_SELECTED;
if (wake_flags & WF_MIGRATED)
en_flags |= ENQUEUE_MIGRATED;
- else
- if (p->in_iowait) {
+ else if (p->in_iowait) {
delayacct_blkio_end(p);
atomic_dec(&task_rq(p)->nr_iowait);
}