Commit 70e51fd5 authored Jun 02, 2018 by Michael Ellerman Committed by Greg Kroah-Hartman Jun 06, 2018

powerpc/rfi-flush: Move out of HARDLOCKUP_DETECTOR #ifdef



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: c3b82ebe ("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>

parent b1d57084

arch/powerpc/kernel/setup_64.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -679,6 +679,7 @@ static int __init disable_hardlockup_detector(void)
		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 dev, struct device_attribute attr, cha
		return sprintf(buf, "Vulnerable\n");
		}
		#endif /* CONFIG_PPC_BOOK3S_64 */
		#endif