samsung_sm8750/android_kernel_samsung_sm8750
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "sched: Change nr_uninterruptible type to unsigned long"

Browse Source 
This reverts commit 496efa228f 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 <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2025-07-30 06:44:12 +00:00
parent e6e2e2e381
commit 5e02972950
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/sched/loadavg.c
View File

@@ -80,7 +80,7 @@ long calc_load_fold_active(struct rq *this_rq, long adjust)
long nr_active, delta = 0; long nr_active, delta = 0;
nr_active = this_rq->nr_running - adjust; 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) { if (nr_active != this_rq->calc_load_active) {
delta = nr_active - this_rq->calc_load_active; delta = nr_active - this_rq->calc_load_active;

2
kernel/sched/sched.h
View File

@@ -1038,7 +1038,7 @@ struct rq {
* one CPU and if it got migrated afterwards it may decrease * one CPU and if it got migrated afterwards it may decrease
* it on another CPU. Always updated under the runqueue lock: * 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 __rcu *curr;
struct task_struct *idle; struct task_struct *idle;