lkml.org 
[lkml]   [2018]   [Feb]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 02/22] powerpc/64s: Fix RFI flush dependency on HARDLOCKUP_DETECTOR
    Date
    4.4-stable review patch.  If anyone has any objections, please let me know.

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

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

    The backport of commit aa8a5e0062ac ("powerpc/64s: Add support for RFI
    flush of L1-D cache"), incorrectly placed the new RFI flush code
    inside an existing #ifdef CONFIG_HARDLOCKUP_DETECTOR block.

    This has the obvious effect of requiring HARDLOCKUP_DETECTOR to be
    enabled in order for RFI flush to be enabled, which is a bug.

    Fix it by moving the #endif up to where it belongs.

    Fixes: c3892946315e ("powerpc/64s: Add support for RFI flush of L1-D cache")
    Reported-by: Bernhard Kaindl <bernhard.kaindl@thalesgroup.com>
    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
    @@ -835,6 +835,7 @@ static int __init disable_hardlockup_det
    return 0;
    }
    early_initcall(disable_hardlockup_detector);
    +#endif

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

    \
     
     \ /
      Last update: 2018-02-26 21:20    [W:4.057 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site