lkml.org 
[lkml]   [2018]   [Jun]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 24/61] powerpc/rfi-flush: Move out of HARDLOCKUP_DETECTOR #ifdef
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

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

    From: Michael Ellerman <mpe@ellerman.id.au>

    The backport of the RFI flush support, done by me, has a minor bug in
    that the code is inside an #ifdef CONFIG_HARDLOCKUP_DETECTOR, which is
    incorrect.

    This doesn't matter with common configs because we enable
    HARDLOCKUP_DETECTOR, but with future patches it will break the build.
    So fix it.

    Fixes: c3b82ebee6e0 ("powerpc/64s: Add support for RFI flush of L1-D cache")
    Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    arch/powerpc/kernel/setup_64.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/arch/powerpc/kernel/setup_64.c
    +++ b/arch/powerpc/kernel/setup_64.c
    @@ -679,6 +679,7 @@ static int __init disable_hardlockup_det
    return 0;
    }
    early_initcall(disable_hardlockup_detector);
    +#endif /* CONFIG_HARDLOCKUP_DETECTOR */

    #ifdef CONFIG_PPC_BOOK3S_64
    static enum l1d_flush_type enabled_flush_types;
    @@ -806,4 +807,3 @@ ssize_t cpu_show_meltdown(struct device
    return sprintf(buf, "Vulnerable\n");
    }
    #endif /* CONFIG_PPC_BOOK3S_64 */
    -#endif

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