Received: by 2002:a25:7ec1:0:0:0:0:0 with SMTP id z184csp6020529ybc; Wed, 27 Nov 2019 13:31:56 -0800 (PST) X-Google-Smtp-Source: APXvYqwc4yxPjdFnDsMxbER7DC/nSA8rvcummIDCmeQQJlDDcJxE1EuDCfUFpg0ofBJDxpop/1Wl X-Received: by 2002:aa7:d3da:: with SMTP id o26mr35372995edr.302.1574890316745; Wed, 27 Nov 2019 13:31:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574890316; cv=none; d=google.com; s=arc-20160816; b=THAXTAE6/r11JR7E8cTzQHYovnEbf5dnN8Gduplzbkm570OATHWmfMdsOskh2aK18m AzBmTSsd5ZGvzERUUPmR6wWVPAXigsZACGxNJ+Lbwhpwa7QLjWTtY2+N03tFi3kqN4CF Pj0o6/idcGvAU3bhk0mHcJlSPJvyj9tuvUfcbR0RJVMDIVZvjgbexPiGyVJ2/N4CtPBE djE/sE4SfmOUL6nI1U+BVTNvtANZZqpMOm0vjNcPKUfI5A1VmfLssvJ7XVFbppzmyqYd gg6xtm4q8mwuHJIBsKyMByKLJPk8/wzWkSKAnkExHDyzctyhHOqBJavniBFQXDxoRFm2 hFew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=VoNPDWCDM2qypxMx/lPxug/bu4Sn9Lp01dj6Y+jHva0=; b=FtbD99jhADXc49s2RfaeJFb4hoESxLNNK/QcmYm0ej7wRS9K/fhxEgf0SWGSjrLAD5 Le39U3rqi2b5hM/X87QSprRsmuyzL1qu9e1eCuGsg3kMWuXurBVD/rp851t3KJBt0DtO HSaEqbSOOMn7qlauL7Kb5b9jjWC+RFz3dDJ4GqD2h4nnPTF8FCKC0IwGJjvtorwJ2RSc mvGh9aYCjV4nuVFPSgWbwp0Qhu1gjUwkO39Ttvk2xG8QSJs4ykHnHXEMoMzB/mtpw4PI 4+ICIM72VdUlUFPPECgmHu29++zSR2up2gYZvDUgmaq6r6umn+Ocoerag67pOIL4WnEN Ayeg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=POoLvSqF; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w10si10664318eja.116.2019.11.27.13.31.32; Wed, 27 Nov 2019 13:31:56 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=POoLvSqF; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730473AbfK0U7r (ORCPT + 99 others); Wed, 27 Nov 2019 15:59:47 -0500 Received: from mail.kernel.org ([198.145.29.99]:51342 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730947AbfK0U7p (ORCPT ); Wed, 27 Nov 2019 15:59:45 -0500 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 EBB1720678; Wed, 27 Nov 2019 20:59:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574888384; bh=u8SiLUbdAmzmgn2psFb7E6iGOkA0Wgtr0WjV9/CVkxQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=POoLvSqFB7ahD1aAE2/UIogYpM216ry/rKcwzTjJn3PXJ19rFz1n8O6ZzFOiEiJn8 bvdQkdB+dBjS+XCe/DuiTIEZooXr8JI2wRjsJn5JRKCln9sGHCnEwOjS8EnpwqAYvP bbEXdlUyziHK87dym9dZLeW6uXGtkXFe+/SsO0Ng= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Nicholas Piggin , Michael Ellerman , Sasha Levin Subject: [PATCH 4.19 114/306] powerpc/64s/radix: Fix radix__flush_tlb_collapsed_pmd double flushing pmd Date: Wed, 27 Nov 2019 21:29:24 +0100 Message-Id: <20191127203123.525654180@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191127203114.766709977@linuxfoundation.org> References: <20191127203114.766709977@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Nicholas Piggin [ Upstream commit dd76ff5af35350fd6d5bb5b069e73b6017f66893 ] Signed-off-by: Nicholas Piggin Signed-off-by: Michael Ellerman Signed-off-by: Sasha Levin --- arch/powerpc/mm/tlb-radix.c | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/powerpc/mm/tlb-radix.c b/arch/powerpc/mm/tlb-radix.c index 796ff5de26d09..1749f15fc0705 100644 --- a/arch/powerpc/mm/tlb-radix.c +++ b/arch/powerpc/mm/tlb-radix.c @@ -1072,7 +1072,6 @@ void radix__flush_tlb_collapsed_pmd(struct mm_struct *mm, unsigned long addr) goto local; } _tlbie_va_range(addr, end, pid, PAGE_SIZE, mmu_virtual_psize, true); - goto local; } else { local: _tlbiel_va_range(addr, end, pid, PAGE_SIZE, mmu_virtual_psize, true); -- 2.20.1