From 5e02972950a8582a66c1eb27803f093ac3f6a105 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 30 Jul 2025 06:44:12 +0000 Subject: [PATCH] Revert "sched: Change nr_uninterruptible type to unsigned long" This reverts commit 496efa228f0dd58980d301e379e5561a9b612eaa which is commit 36569780b0d64de283f9d6c2195fd1a43e221ee8 upstream. It breaks the Android kernel abi and can be brought back in the future in an abi-safe way if it is really needed. Bug: 161946584 Change-Id: I90e7c6703d315496207f1b15c4289130da7ea022 Signed-off-by: Greg Kroah-Hartman --- kernel/sched/loadavg.c | 2 +- kernel/sched/sched.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/sched/loadavg.c b/kernel/sched/loadavg.c index 35537ea03fff..52c8f8226b0d 100644 --- a/kernel/sched/loadavg.c +++ b/kernel/sched/loadavg.c @@ -80,7 +80,7 @@ long calc_load_fold_active(struct rq *this_rq, long adjust) long nr_active, delta = 0; nr_active = this_rq->nr_running - adjust; - nr_active += (long)this_rq->nr_uninterruptible; + nr_active += (int)this_rq->nr_uninterruptible; if (nr_active != this_rq->calc_load_active) { delta = nr_active - this_rq->calc_load_active; diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 146adc66b127..581fc21cf34a 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -1038,7 +1038,7 @@ struct rq { * one CPU and if it got migrated afterwards it may decrease * it on another CPU. Always updated under the runqueue lock: */ - unsigned long nr_uninterruptible; + unsigned int nr_uninterruptible; struct task_struct __rcu *curr; struct task_struct *idle;