summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/0169-sched-Add-saved_state-for-tasks-blocked-on-sleeping-.patch
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-08 17:45:38 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-08 17:46:06 +0000
commit30c4ae2eedacfbb99ce91d04f6232e7c26e498dd (patch)
tree968a4e3149e28312eb427de8cdfc970ad5a8cffb /debian/patches-rt/0169-sched-Add-saved_state-for-tasks-blocked-on-sleeping-.patch
parentMerging upstream version 5.10.216. (diff)
downloadlinux-30c4ae2eedacfbb99ce91d04f6232e7c26e498dd.tar.xz
linux-30c4ae2eedacfbb99ce91d04f6232e7c26e498dd.zip
Merging debian version 5.10.216-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches-rt/0169-sched-Add-saved_state-for-tasks-blocked-on-sleeping-.patch')
-rw-r--r--debian/patches-rt/0169-sched-Add-saved_state-for-tasks-blocked-on-sleeping-.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/debian/patches-rt/0169-sched-Add-saved_state-for-tasks-blocked-on-sleeping-.patch b/debian/patches-rt/0169-sched-Add-saved_state-for-tasks-blocked-on-sleeping-.patch
index 83106676c..78af45d29 100644
--- a/debian/patches-rt/0169-sched-Add-saved_state-for-tasks-blocked-on-sleeping-.patch
+++ b/debian/patches-rt/0169-sched-Add-saved_state-for-tasks-blocked-on-sleeping-.patch
@@ -1,9 +1,9 @@
-From 622996bf8475bf1d06cbb523dacc7469e7b9c864 Mon Sep 17 00:00:00 2001
+From a5589dbb6f277c06f72d80168d2de6dec092b35c Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Sat, 25 Jun 2011 09:21:04 +0200
Subject: [PATCH 169/323] sched: Add saved_state for tasks blocked on sleeping
locks
-Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.10/older/patches-5.10.204-rt100.tar.xz
+Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.10/older/patches-5.10.215-rt107.tar.xz
Spinlocks are state preserving in !RT. RT changes the state when a
task gets blocked on a lock. So we need to remember the state before
@@ -19,7 +19,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
3 files changed, 36 insertions(+), 2 deletions(-)
diff --git a/include/linux/sched.h b/include/linux/sched.h
-index d31da4867bb2..73defe42fd23 100644
+index d31da4867bb28..73defe42fd23d 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -659,6 +659,8 @@ struct task_struct {
@@ -40,7 +40,7 @@ index d31da4867bb2..73defe42fd23 100644
#ifdef CONFIG_SMP
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
-index 390b51366f5e..f6d40256c0d4 100644
+index 390b51366f5ef..f6d40256c0d4c 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -3305,7 +3305,7 @@ try_to_wake_up(struct task_struct *p, unsigned int state, int wake_flags)
@@ -100,7 +100,7 @@ index 390b51366f5e..f6d40256c0d4 100644
{
return try_to_wake_up(p, state, 0);
diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
-index c26b1c7009f4..d4bfc51358d3 100644
+index c26b1c7009f45..d4bfc51358d37 100644
--- a/kernel/sched/sched.h
+++ b/kernel/sched/sched.h
@@ -1753,6 +1753,7 @@ static inline int task_on_rq_migrating(struct task_struct *p)
@@ -112,5 +112,5 @@ index c26b1c7009f4..d4bfc51358d3 100644
/*
* To aid in avoiding the subversion of "niceness" due to uneven distribution
--
-2.43.0
+2.44.0