* [PATCH stable v4.4] powerpc/64s: Fix RFI flush dependency on HARDLOCKUP_DETECTOR
@ 2018-02-26 2:13 Michael Ellerman
2018-02-26 8:43 ` Greg KH
0 siblings, 1 reply; 2+ messages in thread
From: Michael Ellerman @ 2018-02-26 2:13 UTC (permalink / raw)
To: stable, greg; +Cc: linuxppc-dev, bernhard.kaindl
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>
---
arch/powerpc/kernel/setup_64.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index df4a87eb8da4..9eb469bed22b 100644
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -835,6 +835,7 @@ static int __init disable_hardlockup_detector(void)
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 *dev, struct device_attribute *attr, cha
return sprintf(buf, "Vulnerable\n");
}
#endif /* CONFIG_PPC_BOOK3S_64 */
-#endif
--
2.14.1
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH stable v4.4] powerpc/64s: Fix RFI flush dependency on HARDLOCKUP_DETECTOR
2018-02-26 2:13 [PATCH stable v4.4] powerpc/64s: Fix RFI flush dependency on HARDLOCKUP_DETECTOR Michael Ellerman
@ 2018-02-26 8:43 ` Greg KH
0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2018-02-26 8:43 UTC (permalink / raw)
To: Michael Ellerman; +Cc: stable, linuxppc-dev, bernhard.kaindl
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@thalesgroup.com>
> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
> ---
> arch/powerpc/kernel/setup_64.c | 2 +-
Thanks, now queued up.
greg k-h
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-02-26 8:43 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-02-26 2:13 [PATCH stable v4.4] powerpc/64s: Fix RFI flush dependency on HARDLOCKUP_DETECTOR Michael Ellerman
2018-02-26 8:43 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).