From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AA5C5C47254 for ; Fri, 8 May 2020 12:37:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7FF9E24958 for ; Fri, 8 May 2020 12:37:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588941437; bh=GCQZRYNuZPMp57ZSTlZkuHsJuxHJNw2e2VjolFX+Zc8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=yDap3i6CgiMwOTMYFZPTET61b2xGBapTv1TXUaaRiB4nVM7f7YzqTQyDyWAsIUppK Lek+5OxdAIFfmS+S8eqEuw7jMMg3AhHDxgGGnfaZbXzSiP4kzt4WiIJR7aYy6X3e/o ndXvRUjXpez+9frqVmCF18Xp6GseA80r+wgvk3k8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728055AbgEHMhR (ORCPT ); Fri, 8 May 2020 08:37:17 -0400 Received: from mail.kernel.org ([198.145.29.99]:51488 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728018AbgEHMhP (ORCPT ); Fri, 8 May 2020 08:37:15 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8E5E424953; Fri, 8 May 2020 12:37:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588941435; bh=GCQZRYNuZPMp57ZSTlZkuHsJuxHJNw2e2VjolFX+Zc8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OPDkvC0zet4SoFrJFLfMD76TZ4LS4HgeDI+CYUseQiiSAjqfBStBlVo6/nS+mK2Ii nesEijcGDcMz+H8LojYQTwlN1Q/rXoL3K6p9tWakiZDixxvNMzdgIep76esj0eBXMn fmsqYPIC1oc2I9PNJvACz5nuiZb2towMfVXaV0HU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dan Carpenter , linux-mips@linux-mips.org, kernel-janitors@vger.kernel.org, Ralf Baechle Subject: [PATCH 4.4 031/312] MIPS: RM7000: Double locking bug in rm7k_tc_disable() Date: Fri, 8 May 2020 14:30:22 +0200 Message-Id: <20200508123126.677472805@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200508123124.574959822@linuxfoundation.org> References: <20200508123124.574959822@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Dan Carpenter commit 58a7e1c140f3ad61646bc0cd9a1f6a9cafc0b225 upstream. We obviously intended to enable IRQs again at the end. Fixes: 745aef5df1e2 ('MIPS: RM7000: Add support for tertiary cache') Signed-off-by: Dan Carpenter Cc: linux-mips@linux-mips.org Cc: linux-kernel@vger.kernel.org Cc: kernel-janitors@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/13815/ Signed-off-by: Ralf Baechle Signed-off-by: Greg Kroah-Hartman --- arch/mips/mm/sc-rm7k.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/mips/mm/sc-rm7k.c +++ b/arch/mips/mm/sc-rm7k.c @@ -161,7 +161,7 @@ static void rm7k_tc_disable(void) local_irq_save(flags); blast_rm7k_tcache(); clear_c0_config(RM7K_CONF_TE); - local_irq_save(flags); + local_irq_restore(flags); } static void rm7k_sc_disable(void)