summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/Use-CONFIG_PREEMPTION.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches-rt/Use-CONFIG_PREEMPTION.patch')
-rw-r--r--debian/patches-rt/Use-CONFIG_PREEMPTION.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/debian/patches-rt/Use-CONFIG_PREEMPTION.patch b/debian/patches-rt/Use-CONFIG_PREEMPTION.patch
index 873d5a0be..40ad592c2 100644
--- a/debian/patches-rt/Use-CONFIG_PREEMPTION.patch
+++ b/debian/patches-rt/Use-CONFIG_PREEMPTION.patch
@@ -1,7 +1,7 @@
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date: Fri, 26 Jul 2019 11:30:49 +0200
Subject: [PATCH] Use CONFIG_PREEMPTION
-Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.4/older/patches-5.4.13-rt6.tar.xz
+Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.4/older/patches-5.4.13-rt7.tar.xz
Thisi is an all-in-one patch of the current `PREEMPTION' branch.
@@ -797,7 +797,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
bne r4, r0, restore_all
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
-@@ -81,7 +81,7 @@ config STACK_GROWSUP
+@@ -82,7 +82,7 @@ config STACK_GROWSUP
config GENERIC_LOCKBREAK
bool
default y
@@ -1413,7 +1413,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
{
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
-@@ -3654,6 +3654,8 @@ print_trace_header(struct seq_file *m, s
+@@ -3660,6 +3660,8 @@ print_trace_header(struct seq_file *m, s
"desktop",
#elif defined(CONFIG_PREEMPT)
"preempt",