diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-08 03:44:05 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-08 03:44:23 +0000 |
| commit | 38db540ee6930dafa84973fa1c493128ed23d810 (patch) | |
| tree | e2826f458afdbe0c6d40f534d8bc98dae3db836e /debian/patches-rt/0153-ptrace-fix-ptrace-vs-tasklist_lock-race.patch | |
| parent | Merging upstream version 4.19.269. (diff) | |
| download | linux-38db540ee6930dafa84973fa1c493128ed23d810.tar.xz linux-38db540ee6930dafa84973fa1c493128ed23d810.zip | |
Merging debian version 4.19.269-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches-rt/0153-ptrace-fix-ptrace-vs-tasklist_lock-race.patch')
| -rw-r--r-- | debian/patches-rt/0153-ptrace-fix-ptrace-vs-tasklist_lock-race.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/debian/patches-rt/0153-ptrace-fix-ptrace-vs-tasklist_lock-race.patch b/debian/patches-rt/0153-ptrace-fix-ptrace-vs-tasklist_lock-race.patch index 2fffa6e73..1ed66fb0d 100644 --- a/debian/patches-rt/0153-ptrace-fix-ptrace-vs-tasklist_lock-race.patch +++ b/debian/patches-rt/0153-ptrace-fix-ptrace-vs-tasklist_lock-race.patch @@ -1,7 +1,7 @@ From: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Date: Thu, 29 Aug 2013 18:21:04 +0200 -Subject: [PATCH 153/342] ptrace: fix ptrace vs tasklist_lock race -Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=cb675ae1b0511d73895bd276d65c88740717b40b +Subject: [PATCH 153/351] ptrace: fix ptrace vs tasklist_lock race +Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=fb736d5bbc7154b40fd917ad3d2c6b6665f9cf0b As explained by Alexander Fyodorov <halcy@yandex.ru>: @@ -30,7 +30,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> 3 files changed, 68 insertions(+), 7 deletions(-) diff --git a/include/linux/sched.h b/include/linux/sched.h -index e4e206a1e7dd..5374ade34b87 100644 +index 1bdb44910261..c0ee1caf5a9b 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -101,12 +101,8 @@ struct task_group; @@ -46,7 +46,7 @@ index e4e206a1e7dd..5374ade34b87 100644 #define task_contributes_to_load(task) ((task->state & TASK_UNINTERRUPTIBLE) != 0 && \ (task->flags & PF_FROZEN) == 0 && \ (task->state & TASK_NOLOAD) == 0) -@@ -1717,6 +1713,51 @@ static inline int test_tsk_need_resched(struct task_struct *tsk) +@@ -1721,6 +1717,51 @@ static inline int test_tsk_need_resched(struct task_struct *tsk) return unlikely(test_tsk_thread_flag(tsk,TIF_NEED_RESCHED)); } @@ -119,7 +119,7 @@ index bf8360e86f62..9078fdefc6e0 100644 } spin_unlock_irq(&task->sighand->siglock); diff --git a/kernel/sched/core.c b/kernel/sched/core.c -index 1f450a7649f0..9494e2007118 100644 +index d448d4768507..8586d8834f5e 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -1349,6 +1349,18 @@ int migrate_swap(struct task_struct *cur, struct task_struct *p, |