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,URIBL_BLOCKED,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 DA8A8C76186 for ; Wed, 24 Jul 2019 20:23:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A586C21855 for ; Wed, 24 Jul 2019 20:23:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563999809; bh=FkiQiVmbY1YCcI9+LShPsFbYmByYfyJYN8sTYbaSTFc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=smot4XNO7X0w5NF8BhVcx5BkCcx1N3SjiI3abN5ifvCwy3jZUp2pD7IOQIB2zjlVz 9BWUWDZAyWtlmZPpL2bAm4DVefWzbhxtoeIvJrptrYt2mrKjIyVA9qezVc2ZFCcgB0 hk/jce1QQ7Oz6c+2boMgsfbBz61HqxcT0UXfLgpg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390436AbfGXTm5 (ORCPT ); Wed, 24 Jul 2019 15:42:57 -0400 Received: from mail.kernel.org ([198.145.29.99]:44830 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390433AbfGXTm4 (ORCPT ); Wed, 24 Jul 2019 15:42:56 -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 66C0A217D4; Wed, 24 Jul 2019 19:42:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563997375; bh=FkiQiVmbY1YCcI9+LShPsFbYmByYfyJYN8sTYbaSTFc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=b+DHZubzr7hKuu6mvGLGm5Yke7NpMfo5a/HyBzYeLt6USA8qY3LeSJSz27L2jP/31 2+kk2Ku2dKlrK7vTt2Ho+w3Y+nMiLy4oY1Ws78SYZcy9vTvJHFgQ8WOuHP+K8AR9tG YSyX0D1jlTzRnWIFaOAFgBxuxm6ojz9pGfEdzAf4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Andreas Schwab , Christophe Leroy , Michael Ellerman Subject: [PATCH 5.2 388/413] powerpc/mm/32s: fix condition that is always true Date: Wed, 24 Jul 2019 21:21:19 +0200 Message-Id: <20190724191802.702846710@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190724191735.096702571@linuxfoundation.org> References: <20190724191735.096702571@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: Andreas Schwab commit 46c2478af610efb3212b8b08f74389d69899ef70 upstream. Move a misplaced paren that makes the condition always true. Fixes: 63b2bc619565 ("powerpc/mm/32s: Use BATs for STRICT_KERNEL_RWX") Cc: stable@vger.kernel.org # v5.1+ Signed-off-by: Andreas Schwab Reviewed-by: Christophe Leroy Signed-off-by: Michael Ellerman Signed-off-by: Greg Kroah-Hartman --- arch/powerpc/mm/pgtable_32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/powerpc/mm/pgtable_32.c +++ b/arch/powerpc/mm/pgtable_32.c @@ -360,7 +360,7 @@ void mark_initmem_nx(void) unsigned long numpages = PFN_UP((unsigned long)_einittext) - PFN_DOWN((unsigned long)_sinittext); - if (v_block_mapped((unsigned long)_stext) + 1) + if (v_block_mapped((unsigned long)_stext + 1)) mmu_mark_initmem_nx(); else change_page_attr(page, numpages, PAGE_KERNEL);