summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/0240-x86-lazy-preempt-use-proper-return-label-on-32bit-x8.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches-rt/0240-x86-lazy-preempt-use-proper-return-label-on-32bit-x8.patch')
-rw-r--r--debian/patches-rt/0240-x86-lazy-preempt-use-proper-return-label-on-32bit-x8.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/debian/patches-rt/0240-x86-lazy-preempt-use-proper-return-label-on-32bit-x8.patch b/debian/patches-rt/0240-x86-lazy-preempt-use-proper-return-label-on-32bit-x8.patch
index e38dc3355..c3cd394a4 100644
--- a/debian/patches-rt/0240-x86-lazy-preempt-use-proper-return-label-on-32bit-x8.patch
+++ b/debian/patches-rt/0240-x86-lazy-preempt-use-proper-return-label-on-32bit-x8.patch
@@ -1,8 +1,8 @@
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date: Tue, 26 Feb 2019 14:53:49 +0100
-Subject: [PATCH 240/351] x86: lazy-preempt: use proper return label on
+Subject: [PATCH 240/353] x86: lazy-preempt: use proper return label on
32bit-x86
-Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=2f573c1654480f0cf483d8970b1bbbd982643053
+Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=e8d0495e581d23995cde947a1fcd8cd5b76fbe29
The lazy-preempt uses the wrong return label in case preemption isn't
possible. This results crash while returning to the kernel.
@@ -16,10 +16,10 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/x86/entry/entry_32.S b/arch/x86/entry/entry_32.S
-index 324b7539eaab..d8b40085c2b8 100644
+index e52feb8f557c..6ad053de3d22 100644
--- a/arch/x86/entry/entry_32.S
+++ b/arch/x86/entry/entry_32.S
-@@ -759,15 +759,15 @@ ENTRY(resume_kernel)
+@@ -757,15 +757,15 @@ ENTRY(resume_kernel)
# atleast preempt count == 0 ?
cmpl $_PREEMPT_ENABLED,PER_CPU_VAR(__preempt_count)