[PATCH stable v4.4] powerpc/64s: Fix RFI flush dependency on HARDLOCKUP_DETECTOR

[Greg KH]

On Mon, Feb 26, 2018 at 01:13:17PM +1100, Michael Ellerman wrote:
> 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 at thalesgroup.com>
> Signed-off-by: Michael Ellerman <mpe at ellerman.id.au>
> ---
>  arch/powerpc/kernel/setup_64.c | 2 +-

Thanks, now queued up.

greg k-h