This is a note to let you know that I've just added the patch titled
powerpc/64s: Fix RFI flush dependency on HARDLOCKUP_DETECTOR
to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
powerpc-64s-fix-rfi-flush-dependency-on-hardlockup_detector.patch
and it can be found in the queue-4.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From mpe@xxxxxxxxxxxxxx Mon Feb 26 09:42:43 2018
From: Michael Ellerman <mpe@xxxxxxxxxxxxxx>
Date: Mon, 26 Feb 2018 13:13:17 +1100
Subject: powerpc/64s: Fix RFI flush dependency on HARDLOCKUP_DETECTOR
To: stable@xxxxxxxxxxxxxxx, greg@xxxxxxxxx
Cc: linuxppc-dev@xxxxxxxxxx, bernhard.kaindl@xxxxxxxxxxxxxxx
Message-ID: <20180226021317.28767-1-mpe@xxxxxxxxxxxxxx>
From: Michael Ellerman <mpe@xxxxxxxxxxxxxx>
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@xxxxxxxxxxxxxxx>
Signed-off-by: Michael Ellerman <mpe@xxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
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
Patches currently in stable-queue which might be from mpe@xxxxxxxxxxxxxx are
queue-4.4/powerpc-64s-fix-rfi-flush-dependency-on-hardlockup_detector.patch