diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-08 04:15:16 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-08 04:15:28 +0000 |
commit | 0cf6719e1d2f19f831279583065810ceb5ecbd28 (patch) | |
tree | 34052095977dde7bec44b99f60acc8bb77325f76 /debian/patches-rt/0295-hrtimer-Add-a-missing-bracket-and-hide-migration_bas.patch | |
parent | Merging upstream version 4.19.282. (diff) | |
download | linux-0cf6719e1d2f19f831279583065810ceb5ecbd28.tar.xz linux-0cf6719e1d2f19f831279583065810ceb5ecbd28.zip |
Merging debian version 4.19.282-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches-rt/0295-hrtimer-Add-a-missing-bracket-and-hide-migration_bas.patch')
-rw-r--r-- | debian/patches-rt/0295-hrtimer-Add-a-missing-bracket-and-hide-migration_bas.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/debian/patches-rt/0295-hrtimer-Add-a-missing-bracket-and-hide-migration_bas.patch b/debian/patches-rt/0295-hrtimer-Add-a-missing-bracket-and-hide-migration_bas.patch index 248781694..379de3240 100644 --- a/debian/patches-rt/0295-hrtimer-Add-a-missing-bracket-and-hide-migration_bas.patch +++ b/debian/patches-rt/0295-hrtimer-Add-a-missing-bracket-and-hide-migration_bas.patch @@ -1,8 +1,8 @@ From: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Date: Wed, 4 Sep 2019 16:55:27 +0200 -Subject: [PATCH 295/351] hrtimer: Add a missing bracket and hide +Subject: [PATCH 295/353] hrtimer: Add a missing bracket and hide `migration_base' on !SMP -Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=78e97bf152629ea0dc4890964d9a8e92be8c0844 +Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=957a4c80e0cd81de63b3fc11f0aa903aeb9cf2ae [ Upstream commit 47b6de0b7f22c28b40275aeede3993d807668c3b ] @@ -33,7 +33,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c -index 3f9d156c36f1..0f841f18c363 100644 +index 5a053bef18e7..3a5e258c243a 100644 --- a/kernel/time/hrtimer.c +++ b/kernel/time/hrtimer.c @@ -150,6 +150,11 @@ static struct hrtimer_cpu_base migration_cpu_base = { |