From patchwork Sat May 23 05:23:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 225445 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=-3.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 autolearn=no 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 5D5F0C433DF for ; Sat, 23 May 2020 05:23:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 23B63207FB for ; Sat, 23 May 2020 05:23:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590211391; bh=g/DG0Q1vP/78so7jEV/MZHqyxIO+yDBIS8HFEnWDdcc=; h=Date:From:To:Subject:In-Reply-To:List-ID:From; b=p6+fgjYHnpqVZ5CHyQ84Dm0kKI9G3iR4JFtfgnU5g0u9KO0G6uCWQi+ihC4Pbnzux 0wj6JXZuGhLDNPt8L41369w6fbwj6iOAc+w3LOPPG1GxpKA4na1lWM+Dj6ZyGiaFp3 HnPtiVBtcN9P/2FNZ7LFRzcNo/3oQluc0KTXmifY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387604AbgEWFXK (ORCPT ); Sat, 23 May 2020 01:23:10 -0400 Received: from mail.kernel.org ([198.145.29.99]:55640 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387426AbgEWFXK (ORCPT ); Sat, 23 May 2020 01:23:10 -0400 Received: from localhost.localdomain (c-73-231-172-41.hsd1.ca.comcast.net [73.231.172.41]) (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 9BD4120759; Sat, 23 May 2020 05:23:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590211389; bh=g/DG0Q1vP/78so7jEV/MZHqyxIO+yDBIS8HFEnWDdcc=; h=Date:From:To:Subject:In-Reply-To:From; b=GXomZemswploVnapD2guWass1nun1A0sT02zHDrKW11CcWqaHKQopqRRz/xuqH4H4 WdEtbolsckMeiHYpSBB1cWfFrEB3QiWGieTZiOIPXzR2HegIrbMFMM5wVVFDnqXLrO Aw1LGNbB6v/AmumYdMU/369PqdeqUnp3Xfazi/Tk= Date: Fri, 22 May 2020 22:23:09 -0700 From: Andrew Morton To: akpm@linux-foundation.org, davem@davemloft.net, linux-mm@kvack.org, lkp@intel.com, matorola@gmail.com, mm-commits@vger.kernel.org, rppt@linux.ibm.com, stable@vger.kernel.org, torvalds@linux-foundation.org Subject: [patch 09/11] sparc32: use PUD rather than PGD to get PMD in srmmu_nocache_init() Message-ID: <20200523052309.4caVN81-C%akpm@linux-foundation.org> In-Reply-To: <20200522222217.ee14ad7eda7aab1e6697da6c@linux-foundation.org> User-Agent: s-nail v14.8.16 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Mike Rapoport Subject: sparc32: use PUD rather than PGD to get PMD in srmmu_nocache_init() The kbuild test robot reported the following warning: arch/sparc/mm/srmmu.c: In function 'srmmu_nocache_init': >> arch/sparc/mm/srmmu.c:300:9: error: variable 'pud' set but not used >> [-Werror=unused-but-set-variable] 300 | pud_t *pud; This warning is caused by misprint in the page table traversal in srmmu_nocache_init() function which accessed a PMD entry using PGD rather than PUD. Since sparc32 has only 3 page table levels, the PGD and PUD are essentially the same and usage of __nocache_fix() removed the type checking. Use PUD for the consistency and to silence the compiler warning. Link: http://lkml.kernel.org/r/20200520132005.GM1059226@linux.ibm.com Fixes: 7235db268a2777bc38 ("sparc32: use pgtable-nopud instead of 4level-fixup") Signed-off-by: Mike Rapoport Reported-by: kbuild test robot Cc: David S. Miller Cc: Anatoly Pugachev Cc: Signed-off-by: Andrew Morton --- arch/sparc/mm/srmmu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/sparc/mm/srmmu.c~sparc32-use-pud-rather-than-pgd-to-get-pmd-in-srmmu_nocache_init +++ a/arch/sparc/mm/srmmu.c @@ -333,7 +333,7 @@ static void __init srmmu_nocache_init(vo pgd = pgd_offset_k(vaddr); p4d = p4d_offset(__nocache_fix(pgd), vaddr); pud = pud_offset(__nocache_fix(p4d), vaddr); - pmd = pmd_offset(__nocache_fix(pgd), vaddr); + pmd = pmd_offset(__nocache_fix(pud), vaddr); pte = pte_offset_kernel(__nocache_fix(pmd), vaddr); pteval = ((paddr >> 4) | SRMMU_ET_PTE | SRMMU_PRIV);