Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit abd9fd4a authored by Helge Deller's avatar Helge Deller Committed by Greg Kroah-Hartman
Browse files

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



commit d5654e156bc4d68a87bbaa6d7e020baceddf6e68 upstream.

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 avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 08be2c1b

arch/parisc/kernel/hpmc.S

+5 −1
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ END(hpmc_pim_data) 
	.text



	.import intr_save, code

	.align 16

ENTRY_CFI(os_hpmc)

.os_hpmc:
@@ -300,12 +301,15 @@ os_hpmc_6: 


	b .

	nop

	.align 16	/* make function length multiple of 16 bytes */

ENDPROC_CFI(os_hpmc)

.os_hpmc_end:





	__INITRODATA

.globl os_hpmc_size

	.align 4

	.export os_hpmc_size

	.type   os_hpmc_size, @object

	.size   os_hpmc_size, 4

os_hpmc_size:

	.word .os_hpmc_end-.os_hpmc