Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

[karo-tx-linux.git] / arch / powerpc / mm / mmu_context_iommu.c

diff --git a/arch/powerpc/mm/mmu_context_iommu.c b/arch/powerpc/mm/mmu_context_iommu.c
index 104bad029ce9b98afff249f5441515c6b4d625f5..497130c5c74203f9988d9d8efbb6bbc76757704c 100644 (file)
--- a/arch/powerpc/mm/mmu_context_iommu.c
+++ b/arch/powerpc/mm/mmu_context_iommu.c
@@ -10,7 +10,7 @@
  *
  */
 
-#include <linux/sched.h>
+#include <linux/sched/signal.h>
 #include <linux/slab.h>
 #include <linux/rculist.h>
 #include <linux/vmalloc.h>
@@ -184,7 +184,7 @@ long mm_iommu_get(struct mm_struct *mm, unsigned long ua, unsigned long entries,
                 * of the CMA zone if possible. NOTE: faulting in + migration
                 * can be expensive. Batching can be considered later
                 */
-               if (get_pageblock_migratetype(page) == MIGRATE_CMA) {
+               if (is_migrate_cma_page(page)) {
                        if (mm_iommu_move_page_from_cma(page))
                                goto populate;
                        if (1 != get_user_pages_fast(ua + (i << PAGE_SHIFT),