powerpc/64s: Fix RFI flush dependency on HARDLOCKUP_DETECTOR
commit920a541397f7b897cb2d0db4be3889df332899f7
authorMichael Ellerman <mpe@ellerman.id.au>
Mon, 26 Feb 2018 02:13:17 +0000 (26 13:13 +1100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 28 Feb 2018 09:17:21 +0000 (28 10:17 +0100)
tree1219343e43e7d56d005a064ef2ca263ed22035ec
parent482526ec0ad07de8cc6a4a2e9376057e83e118c9
powerpc/64s: Fix RFI flush dependency on HARDLOCKUP_DETECTOR

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