The patch titled
Subject: mm-introduce-page_shift-fix
has been added to the -mm tree. Its filename is
mm-introduce-page_shift-fix.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/mm-introduce-page_shift-fix.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/mm-introduce-page_shift-fix.patch
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 and is updated
there every 3-4 working days
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: mm-introduce-page_shift-fix
fix build in tce_page_is_contained()
Link: http://lkml.kernel.org/r/201907241853.yNQTrJWd%25lkp@xxxxxxxxx
Reported-by: kbuild test robot <lkp@xxxxxxxxx>
Cc: Ira Weiny <ira.weiny@xxxxxxxxx>
Cc: Kirill A. Shutemov <kirill.shutemov@xxxxxxxxxxxxxxx>
Cc: "Matthew Wilcox (Oracle)" <willy@xxxxxxxxxxxxx>
Cc: Michal Hocko <mhocko@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/vfio/vfio_iommu_spapr_tce.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
--- a/drivers/vfio/vfio_iommu_spapr_tce.c~mm-introduce-page_shift-fix
+++ a/drivers/vfio/vfio_iommu_spapr_tce.c
@@ -176,13 +176,13 @@ put_exit:
}
static bool tce_page_is_contained(struct mm_struct *mm, unsigned long hpa,
- unsigned int page_shift)
+ unsigned int it_page_shift)
{
struct page *page;
unsigned long size = 0;
- if (mm_iommu_is_devmem(mm, hpa, page_shift, &size))
- return size == (1UL << page_shift);
+ if (mm_iommu_is_devmem(mm, hpa, it_page_shift, &size))
+ return size == (1UL << it_page_shift);
page = pfn_to_page(hpa >> PAGE_SHIFT);
/*
@@ -190,7 +190,7 @@ static bool tce_page_is_contained(struct
* a page we just found. Otherwise the hardware can get access to
* a bigger memory chunk that it should.
*/
- return page_shift(compound_head(page)) >= page_shift;
+ return page_shift(compound_head(page)) >= it_page_shift;
}
static inline bool tce_groups_attached(struct tce_container *container)
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
asm-generic-fix-wtype-limits-compiler-warnings-fix.patch
ocfs2-clear-zero-in-unaligned-direct-io-checkpatch-fixes.patch
mm.patch
mm-introduce-page_shift-fix.patch
mm-memory_hotplug-remove-move_pfn_range-fix.patch
mm-compaction-clear-total_migratefree_scanned-before-scanning-a-new-zone-fix-fix.patch
mm-compaction-clear-total_migratefree_scanned-before-scanning-a-new-zone-fix-2-fix.patch
mm-oom-avoid-printk-iteration-under-rcu-fix.patch
mm-oom_killer-add-task-uid-to-info-message-on-an-oom-kill-fix.patch
diff-sucks.patch
drivers-tty-serial-sh-scic-suppress-warning.patch
kernel-forkc-export-kernel_thread-to-modules.patch
