Commit 5a41c652 authored by Helge Deller's avatar Helge Deller Committed by Greg Kroah-Hartman

parisc: Fix HPMC handler by increasing size to multiple of 16 bytes

[ Upstream commit d5654e15 ]

Make sure that the HPMC (High Priority Machine Check) handler is 16-byte
aligned and that it's length in the IVT is a multiple of 16 bytes.
Otherwise PDC may decide not to call the HPMC crash handler.
Signed-off-by: default avatarHelge Deller <deller@gmx.de>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 4d01ed83
...@@ -83,6 +83,7 @@ END(hpmc_pim_data) ...@@ -83,6 +83,7 @@ END(hpmc_pim_data)
.text .text
.import intr_save, code .import intr_save, code
.align 16
ENTRY_CFI(os_hpmc) ENTRY_CFI(os_hpmc)
.os_hpmc: .os_hpmc:
...@@ -299,12 +300,15 @@ os_hpmc_6: ...@@ -299,12 +300,15 @@ os_hpmc_6:
b . b .
nop nop
.align 16 /* make function length multiple of 16 bytes */
ENDPROC_CFI(os_hpmc) ENDPROC_CFI(os_hpmc)
.os_hpmc_end: .os_hpmc_end:
__INITRODATA __INITRODATA
.globl os_hpmc_size
.align 4 .align 4
.export os_hpmc_size .type os_hpmc_size, @object
.size os_hpmc_size, 4
os_hpmc_size: os_hpmc_size:
.word .os_hpmc_end-.os_hpmc .word .os_hpmc_end-.os_hpmc
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment