Merging debian version 4.19.304-1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 58 insertions, 0 deletions

diff --git a/debian/patches-rt/0353-Revert-sched-rt-Provide-migrate_disable-enable-inlin.patch b/debian/patches-rt/0353-Revert-sched-rt-Provide-migrate_disable-enable-inlin.patch
new file mode 100644
index 000000000..c31c75707
--- /dev/null
+++ b/debian/patches-rt/0353-Revert-sched-rt-Provide-migrate_disable-enable-inlin.patch
@@ -0,0 +1,58 @@
+From: Daniel Wagner <wagi@monom.org>
+Date: Thu, 7 Dec 2023 15:54:10 +0100
+Subject: [PATCH 353/354] Revert "sched/rt: Provide migrate_disable/enable()
+ inlines"
+Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=c127f3a8909b2dc34b7e211dba228ce6f63ec46c
+
+This reverts commit 56e8949825226341d28dd5156b3d0057684ff669.
+
+The tree contains already the migrate_disable/enable() helpers thus this
+stable backport conflicts (b) with the existing definition (compiler
+complains with conflicting definition). Thus we don't need this
+backported functions and can avoid the conflict by just dropping the
+backport.
+
+Signed-off-by: Daniel Wagner <wagi@monom.org>
+---
+ include/linux/preempt.h | 30 ------------------------------
+ 1 file changed, 30 deletions(-)
+
+diff --git a/include/linux/preempt.h b/include/linux/preempt.h
+index 29ecd13afdda..9c74a019bf57 100644
+--- a/include/linux/preempt.h
++++ b/include/linux/preempt.h
+@@ -422,34 +422,4 @@ static inline void preempt_notifier_init(struct preempt_notifier *notifier,
+ 
+ #endif
+ 
+-/**
+- * migrate_disable - Prevent migration of the current task
+- *
+- * Maps to preempt_disable() which also disables preemption. Use
+- * migrate_disable() to annotate that the intent is to prevent migration,
+- * but not necessarily preemption.
+- *
+- * Can be invoked nested like preempt_disable() and needs the corresponding
+- * number of migrate_enable() invocations.
+- */
+-static __always_inline void migrate_disable(void)
+-{
+-	preempt_disable();
+-}
+-
+-/**
+- * migrate_enable - Allow migration of the current task
+- *
+- * Counterpart to migrate_disable().
+- *
+- * As migrate_disable() can be invoked nested, only the outermost invocation
+- * reenables migration.
+- *
+- * Currently mapped to preempt_enable().
+- */
+-static __always_inline void migrate_enable(void)
+-{
+-	preempt_enable();
+-}
+-
+ #endif /* __LINUX_PREEMPT_H */