diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-08 04:21:44 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-08 04:22:00 +0000 |
commit | 9b228b28ccd91b2f915f0575b7d67a8610b72d30 (patch) | |
tree | 3197d6e68ec1f053a5d60a1e0d84fa334ac486f1 /debian/patches-rt/0111-sched-Use-the-proper-LOCK_OFFSET-for-cond_resched.patch | |
parent | Merging upstream version 4.19.304. (diff) | |
download | linux-9b228b28ccd91b2f915f0575b7d67a8610b72d30.tar.xz linux-9b228b28ccd91b2f915f0575b7d67a8610b72d30.zip |
Merging debian version 4.19.304-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches-rt/0111-sched-Use-the-proper-LOCK_OFFSET-for-cond_resched.patch')
-rw-r--r-- | debian/patches-rt/0111-sched-Use-the-proper-LOCK_OFFSET-for-cond_resched.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/debian/patches-rt/0111-sched-Use-the-proper-LOCK_OFFSET-for-cond_resched.patch b/debian/patches-rt/0111-sched-Use-the-proper-LOCK_OFFSET-for-cond_resched.patch index 2a1ddee4c..425c7f337 100644 --- a/debian/patches-rt/0111-sched-Use-the-proper-LOCK_OFFSET-for-cond_resched.patch +++ b/debian/patches-rt/0111-sched-Use-the-proper-LOCK_OFFSET-for-cond_resched.patch @@ -1,7 +1,7 @@ From: Thomas Gleixner <tglx@linutronix.de> Date: Sun, 17 Jul 2011 22:51:33 +0200 -Subject: [PATCH 111/353] sched: Use the proper LOCK_OFFSET for cond_resched() -Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=40aea8333fd3327ba94572e05c29392ffbdad221 +Subject: [PATCH 111/354] sched: Use the proper LOCK_OFFSET for cond_resched() +Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=5e119fb8d861fb7d3beeb30a7442174fc144f72d RT does not increment preempt count when a 'sleeping' spinlock is locked. Update PREEMPT_LOCK_OFFSET for that case. @@ -12,7 +12,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> 1 file changed, 4 insertions(+) diff --git a/include/linux/preempt.h b/include/linux/preempt.h -index f7a17fcc3fec..b7fe717eb1f4 100644 +index 02ba5c80bf0d..22829223534b 100644 --- a/include/linux/preempt.h +++ b/include/linux/preempt.h @@ -118,7 +118,11 @@ |