diff options
| author | Peter Zijlstra <peterz@infradead.org> | 2025-07-14 17:16:28 +0200 |
|---|---|---|
| committer | Peter Zijlstra <peterz@infradead.org> | 2025-07-14 17:16:28 +0200 |
| commit | 8f2146159b3a24d4fde0479c5e19f31908419004 (patch) | |
| tree | 8a456e37149a3cd12e5e8bb1a6484f8fd7ffec3d /kernel/sched/sched.h | |
| parent | 1eec89a671413ce38df9fe9e70f5130a9eb79a59 (diff) | |
| parent | 36569780b0d64de283f9d6c2195fd1a43e221ee8 (diff) | |
Merge branch 'tip/sched/urgent'
Avoid merge conflicts
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Diffstat (limited to 'kernel/sched/sched.h')
| -rw-r--r-- | kernel/sched/sched.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 3058fb6246da..ac953fad8c21 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -1140,7 +1140,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 int nr_uninterruptible; + unsigned long nr_uninterruptible; union { struct task_struct __rcu *donor; /* Scheduler context */ |