fixes for 5.2

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-5.2/series b/queue-5.2/series
index 453d7a552a2d05c214e70ebd7074cb63d8776c66..cc80018b182049b10b885b3e2fe687e6ba2a3d47 100644 (file)
--- a/queue-5.2/series
+++ b/queue-5.2/series
@@ -18,3 +18,4 @@ s390-qdio-don-t-touch-the-dsci-in-tiqdio_add_input_queues.patch
 crypto-talitos-move-struct-talitos_edesc-into-talitos.h.patch
 crypto-talitos-fix-hash-on-sec1.patch
 crypto-nx-set-receive-window-credits-to-max-number-of-crbs-in-rxfifo.patch
+x86-entry-32-fix-endproc-of-common_spurious.patch

diff --git a/queue-5.2/x86-entry-32-fix-endproc-of-common_spurious.patch b/queue-5.2/x86-entry-32-fix-endproc-of-common_spurious.patch
new file mode 100644 (file)
index 0000000..58ec87f
--- /dev/null
+++ b/queue-5.2/x86-entry-32-fix-endproc-of-common_spurious.patch
@@ -0,0 +1,37 @@
+From 54777c021f76605d7ce3156cc4bd807086f16501 Mon Sep 17 00:00:00 2001
+From: Jiri Slaby <jslaby@suse.cz>
+Date: Tue, 9 Jul 2019 08:34:02 +0200
+Subject: x86/entry/32: Fix ENDPROC of common_spurious
+
+[ 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.20.1
+