Home Home > GIT Browse > stable
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2019-07-21 10:23:21 +0200
committerJiri Slaby <jslaby@suse.cz>2019-07-21 10:23:30 +0200
commitece1b8b3e80715f96897f5adfab3cde4244484ee (patch)
treeda5274a686854a8acf0d25c6f65e616c59cfc5e8
parent8a9563b199ccad3b389b8e2be3d393f2dcbe8a62 (diff)
x86/entry/32: Fix ENDPROC of common_spurious (bnc#1012628).
-rw-r--r--patches.kernel.org/5.2.2-021-x86-entry-32-Fix-ENDPROC-of-common_spurious.patch39
-rw-r--r--series.conf1
2 files changed, 40 insertions, 0 deletions
diff --git a/patches.kernel.org/5.2.2-021-x86-entry-32-Fix-ENDPROC-of-common_spurious.patch b/patches.kernel.org/5.2.2-021-x86-entry-32-Fix-ENDPROC-of-common_spurious.patch
new file mode 100644
index 0000000000..5763cdc773
--- /dev/null
+++ b/patches.kernel.org/5.2.2-021-x86-entry-32-Fix-ENDPROC-of-common_spurious.patch
@@ -0,0 +1,39 @@
+From: Jiri Slaby <jslaby@suse.cz>
+Date: Tue, 9 Jul 2019 08:34:02 +0200
+Subject: [PATCH] x86/entry/32: Fix ENDPROC of common_spurious
+References: bnc#1012628
+Patch-mainline: 5.2.2
+Git-commit: 1cbec37b3f9cff074a67bef4fc34b30a09958a0a
+
+[ Upstream commit 1cbec37b3f9cff074a67bef4fc34b30a09958a0a ]
+
+common_spurious is currently ENDed erroneously. common_interrupt is used
+in its ENDPROC. So fix this mistake.
+
+Found by my asm macros rewrite patchset.
+
+Fixes: f8a8fe61fec8 ("x86/irq: Seperate unused system vectors from spurious entry again")
+Signed-off-by: Jiri Slaby <jslaby@suse.cz>
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+Link: https://lkml.kernel.org/r/20190709063402.19847-1-jslaby@suse.cz
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ arch/x86/entry/entry_32.S | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/x86/entry/entry_32.S b/arch/x86/entry/entry_32.S
+index 44c6e6f54bf7..f49e11669271 100644
+--- a/arch/x86/entry/entry_32.S
++++ b/arch/x86/entry/entry_32.S
+@@ -1125,7 +1125,7 @@ common_spurious:
+ movl %esp, %eax
+ call smp_spurious_interrupt
+ jmp ret_from_intr
+-ENDPROC(common_interrupt)
++ENDPROC(common_spurious)
+ #endif
+
+ /*
+--
+2.22.0
+
diff --git a/series.conf b/series.conf
index fa65fa12d2..1b1ce83e4f 100644
--- a/series.conf
+++ b/series.conf
@@ -108,6 +108,7 @@
patches.kernel.org/5.2.2-018-crypto-talitos-move-struct-talitos_edesc-into-t.patch
patches.kernel.org/5.2.2-019-crypto-talitos-fix-hash-on-SEC1.patch
patches.kernel.org/5.2.2-020-crypto-NX-Set-receive-window-credits-to-max-num.patch
+ patches.kernel.org/5.2.2-021-x86-entry-32-Fix-ENDPROC-of-common_spurious.patch
########################################################
# Build fixes that apply to the vanilla kernel too.