diff options
| author | Helge Deller <deller@gmx.de> | 2018-03-24 23:18:25 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-11-21 11:25:58 +0300 |
| commit | 5a41c652134b6c55442b67dc5acc4b0eee56883f (patch) | |
| tree | 7dc0d063f4e24c370125a8b3281e482ca84ba5ff /arch/parisc | |
| parent | 4d01ed83361cd01012b35413aac2711f18932fed (diff) | |
| download | linux-5a41c652134b6c55442b67dc5acc4b0eee56883f.tar.xz | |
parisc: Fix HPMC handler by increasing size to multiple of 16 bytes
[ Upstream commit d5654e156bc4d68a87bbaa6d7e020baceddf6e68 ]
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: Helge Deller <deller@gmx.de>
Cc: stable@vger.kernel.org
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'arch/parisc')
| -rw-r--r-- | arch/parisc/kernel/hpmc.S | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/parisc/kernel/hpmc.S b/arch/parisc/kernel/hpmc.S index 38d461aec46d..407b3aa5aa07 100644 --- a/arch/parisc/kernel/hpmc.S +++ b/arch/parisc/kernel/hpmc.S @@ -83,6 +83,7 @@ END(hpmc_pim_data) .text .import intr_save, code + .align 16 ENTRY_CFI(os_hpmc) .os_hpmc: @@ -299,12 +300,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 |