On Mon, Oct 10, 2022 at 01:13:54PM -0700, Andrew Morton wrote: > > The patch titled > Subject: highmem-fix-kmap_to_page-for-kmap_local_page-addresses-fix > has been added to the -mm mm-unstable branch. Its filename is > highmem-fix-kmap_to_page-for-kmap_local_page-addresses-fix.patch > > This patch will shortly appear at > https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/highmem-fix-kmap_to_page-for-kmap_local_page-addresses-fix.patch > > This patch will later appear in the mm-unstable branch at > git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm > > Before you just go and hit "reply", please: > a) Consider who else should be cc'ed > b) Prefer to cc a suitable mailing list as well > c) Ideally: find the original patch on the mailing list and do a > reply-to-all to that, adding suitable additional cc's > > *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** > > The -mm tree is included into linux-next via the mm-everything > branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm > and is updated there every 2-3 working days > > ------------------------------------------------------ > From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> > Subject: highmem-fix-kmap_to_page-for-kmap_local_page-addresses-fix > Date: Mon Oct 10 01:12:33 PM PDT 2022 > > fix warning > > mm/highmem.c:164:7: warning: Local variable 'i' shadows outer variable [shadowVariable] > > Reported-by: kernel test robot <lkp@xxxxxxxxx> > Cc: Al Viro <viro@xxxxxxxxxxxxxxxxxx> > Cc: Christoph Hellwig <hch@xxxxxx> > Cc: "Fabio M. De Francesco" <fmdefrancesco@xxxxxxxxx> > Cc: Ira Weiny <ira.weiny@xxxxxxxxx> > Cc: kernel test robot <lkp@xxxxxxxxx> > Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> > Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Thank you! I've been meaning to get another version of the patch out. But I've been super busy today. Reviewed-by: Ira Weiny <ira.weiny@xxxxxxxxx> Ira > --- > > mm/highmem.c | 7 ++----- > 1 file changed, 2 insertions(+), 5 deletions(-) > > --- a/mm/highmem.c~highmem-fix-kmap_to_page-for-kmap_local_page-addresses-fix > +++ a/mm/highmem.c > @@ -160,11 +160,8 @@ struct page *__kmap_to_page(void *vaddr) > > /* kmap() mappings */ > if (WARN_ON_ONCE(addr >= PKMAP_ADDR(0) && > - addr < PKMAP_ADDR(LAST_PKMAP))) { > - int i = PKMAP_NR(addr); > - > - return pte_page(pkmap_page_table[i]); > - } > + addr < PKMAP_ADDR(LAST_PKMAP))) > + return pte_page(pkmap_page_table[PKMAP_NR(addr)]); > > /* kmap_local_page() mappings */ > if (WARN_ON_ONCE(base >= __fix_to_virt(FIX_KMAP_END) && > _ > > Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are > > hugetlb-take-hugetlb-vma_lock-when-clearing-vma_lock-vma-pointer-fix-2.patch > highmem-fix-kmap_to_page-for-kmap_local_page-addresses-fix.patch >
