From: Sasha Levin Date: Thu, 18 Jul 2019 00:11:49 +0000 (-0400) Subject: fixes for 5.1 X-Git-Tag: v5.2.2~4 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6f836d0e58a2d35df6757e0e681b8b9e0dfc6f04;p=thirdparty%2Fkernel%2Fstable-queue.git fixes for 5.1 Signed-off-by: Sasha Levin --- diff --git a/queue-5.1/series b/queue-5.1/series index 594193617d1..0e6a498ee31 100644 --- a/queue-5.1/series +++ b/queue-5.1/series @@ -51,3 +51,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.1/x86-entry-32-fix-endproc-of-common_spurious.patch b/queue-5.1/x86-entry-32-fix-endproc-of-common_spurious.patch new file mode 100644 index 00000000000..84b93824286 --- /dev/null +++ b/queue-5.1/x86-entry-32-fix-endproc-of-common_spurious.patch @@ -0,0 +1,37 @@ +From da77e2d348b21f699c5fe9bb4fba31793b995dd6 Mon Sep 17 00:00:00 2001 +From: Jiri Slaby +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 +Signed-off-by: Thomas Gleixner +Link: https://lkml.kernel.org/r/20190709063402.19847-1-jslaby@suse.cz +Signed-off-by: Sasha Levin +--- + 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 ce60893bc8c8..f4afacfd40bb 100644 +--- a/arch/x86/entry/entry_32.S ++++ b/arch/x86/entry/entry_32.S +@@ -1126,7 +1126,7 @@ common_spurious: + movl %esp, %eax + call smp_spurious_interrupt + jmp ret_from_intr +-ENDPROC(common_interrupt) ++ENDPROC(common_spurious) + #endif + + /* +-- +2.20.1 +