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/0297-sched-migrate_dis-enable-Use-sleeping_lock-to-annota.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 '')
| -rw-r--r-- | debian/patches-rt/0297-sched-migrate_dis-enable-Use-sleeping_lock-to-annota.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/debian/patches-rt/0297-sched-migrate_dis-enable-Use-sleeping_lock-to-annota.patch b/debian/patches-rt/0297-sched-migrate_dis-enable-Use-sleeping_lock-to-annota.patch index 11ce037e5..964a19590 100644 --- a/debian/patches-rt/0297-sched-migrate_dis-enable-Use-sleeping_lock-to-annota.patch +++ b/debian/patches-rt/0297-sched-migrate_dis-enable-Use-sleeping_lock-to-annota.patch @@ -1,11 +1,11 @@ From: Scott Wood <swood@redhat.com> Date: Tue, 24 Sep 2019 14:36:41 +0200 -Subject: [PATCH 297/342] =?UTF-8?q?sched:=20migrate=5Fdis/enable:=20Use=20?= +Subject: [PATCH 297/351] =?UTF-8?q?sched:=20migrate=5Fdis/enable:=20Use=20?= =?UTF-8?q?sleeping=5Flock=E2=80=A6()=20to=20annotate=20sleeping=20points?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=cb7f34c0ba155510ebd0db8410614eca88812750 +Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=302ef1699867ae23b2531b0f689517b615c25866 [ Upstream commit 4230dd3824c3e1785504e6f757ce79a4b55651fa ] @@ -38,10 +38,10 @@ index 396394ebbc5b..4bf82665f28c 100644 preempt_disable(); preempt_lazy_disable(); diff --git a/kernel/sched/core.c b/kernel/sched/core.c -index 1d4d4780dd79..33c1ae19410e 100644 +index ea275b4b3d0a..b5675306ebed 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c -@@ -7366,7 +7366,10 @@ void migrate_enable(void) +@@ -7367,7 +7367,10 @@ void migrate_enable(void) unpin_current_cpu(); preempt_lazy_enable(); preempt_enable(); |