lkml.org 
[lkml]   [2018]   [Nov]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 27/83] parisc: Fix HPMC handler by increasing size to multiple of 16 bytes
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    [ 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>
    ---
    arch/parisc/kernel/hpmc.S | 6 +++++-
    1 file changed, 5 insertions(+), 1 deletion(-)

    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
    --
    2.17.1


    \
     
     \ /
      Last update: 2018-11-19 18:34    [W:4.160 / U:0.072 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site