From patchwork Sun May 24 23:18:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 225437 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 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 F3ADFC433DF for ; Sun, 24 May 2020 23:18:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CC07820878 for ; Sun, 24 May 2020 23:18:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590362320; bh=oeGXlfEic6+p/ZhjHn0rSSIRETI98MNJwXh7+d9m+kg=; h=Date:From:To:Subject:List-ID:From; b=ohXhEbazdqUaITahfb6xBrXT0hYWcZpqy/1xD532ESASCe6ZS+pxhzJmMPSiV7PXI Y34puLJORnEZ8aczUGnfWap0yGhtmjmhLgE4bdvgElVJ5u2gBsLclrvVyAO6GdI44J qxx5PAekjMa/+ybYTBBsFXmojjz1so3SciQ7BAvA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388552AbgEXXSk (ORCPT ); Sun, 24 May 2020 19:18:40 -0400 Received: from mail.kernel.org ([198.145.29.99]:54944 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388202AbgEXXSk (ORCPT ); Sun, 24 May 2020 19:18:40 -0400 Received: from localhost.localdomain (c-71-198-47-131.hsd1.ca.comcast.net [71.198.47.131]) (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 9190020787; Sun, 24 May 2020 23:18:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590362319; bh=oeGXlfEic6+p/ZhjHn0rSSIRETI98MNJwXh7+d9m+kg=; h=Date:From:To:Subject:From; b=Ylsuz5uV7Vx8HXj04fZsRMdJDTn5aaIKYiLtuSaX6Zf4o1iu5ouAr0ht3Xy9brH28 kr1HevCVLf86CIM1WJ1ng3YCWmwq4vEXE420eDjlSnZDQjBjUfAaFoIJaoMi3+OASk 5GxTWKLdG60dsahfBEvUNLaUUoHrp7gIhN/RzRew= Date: Sun, 24 May 2020 16:18:39 -0700 From: akpm@linux-foundation.org To: davem@davemloft.net, lkp@intel.com, matorola@gmail.com, mm-commits@vger.kernel.org, rppt@linux.ibm.com, stable@vger.kernel.org Subject: [merged] sparc32-use-pud-rather-than-pgd-to-get-pmd-in-srmmu_nocache_init.patch removed from -mm tree Message-ID: <20200524231839.gJ8sc9Bzt%akpm@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 The patch titled Subject: sparc32: use PUD rather than PGD to get PMD in srmmu_nocache_init() has been removed from the -mm tree. Its filename was sparc32-use-pud-rather-than-pgd-to-get-pmd-in-srmmu_nocache_init.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ 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);