From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:41784 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751022AbeBZIsJ (ORCPT ); Mon, 26 Feb 2018 03:48:09 -0500 Subject: Patch "powerpc/64s: Fix RFI flush dependency on HARDLOCKUP_DETECTOR" has been added to the 4.4-stable tree To: mpe@ellerman.id.au, bernhard.kaindl@thalesgroup.com, gregkh@linuxfoundation.org Cc: , From: Date: Mon, 26 Feb 2018 09:48:09 +0100 In-Reply-To: <20180226021317.28767-1-mpe@ellerman.id.au> Message-ID: <151963488911826@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: 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 know about it. >>From mpe@ellerman.id.au Mon Feb 26 09:42:43 2018 From: Michael Ellerman Date: Mon, 26 Feb 2018 13:13:17 +1100 Subject: powerpc/64s: Fix RFI flush dependency on HARDLOCKUP_DETECTOR To: stable@vger.kernel.org, greg@kroah.com Cc: linuxppc-dev@ozlabs.org, bernhard.kaindl@thalesgroup.com Message-ID: <20180226021317.28767-1-mpe@ellerman.id.au> From: Michael Ellerman 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 Signed-off-by: Michael Ellerman Signed-off-by: Greg Kroah-Hartman --- 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@ellerman.id.au are queue-4.4/powerpc-64s-fix-rfi-flush-dependency-on-hardlockup_detector.patch