Patch "powerpc/mm: Fix build break when CMA=n && SPAPR_TCE_IOMMU=y" has been added to the 4.10-stable tree

Patch "powerpc/mm: Fix build break when CMA=n && SPAPR_TCE_IOMMU=y" has been added to the 4.10-stable tree

[gregkh]

This is a note to let you know that I've just added the patch titled

    powerpc/mm: Fix build break when CMA=n && SPAPR_TCE_IOMMU=y

to the 4.10-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     powerpc-mm-fix-build-break-when-cma-n-spapr_tce_iommu-y.patch
and it can be found in the queue-4.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From a05ef161cdd22faccffe06f21fc8f1e249565385 Mon Sep 17 00:00:00 2001
From: Michael Ellerman <mpe@ellerman.id.au>
Date: Tue, 14 Feb 2017 13:44:05 +1100
Subject: powerpc/mm: Fix build break when CMA=n && SPAPR_TCE_IOMMU=y
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

From: Michael Ellerman <mpe@ellerman.id.au>

commit a05ef161cdd22faccffe06f21fc8f1e249565385 upstream.

Currently the build breaks if CMA=n and SPAPR_TCE_IOMMU=y:

  arch/powerpc/mm/mmu_context_iommu.c: In function ‘mm_iommu_get’:
  arch/powerpc/mm/mmu_context_iommu.c:193:42: error: ‘MIGRATE_CMA’ undeclared (first use in this function)
  if (get_pageblock_migratetype(page) == MIGRATE_CMA) {
  ^~~~~~~~~~~

Fix it by using the existing is_migrate_cma_page(), which evaulates to
false when CMA=n.

Fixes: 2e5bbb5461f1 ("KVM: PPC: Book3S HV: Migrate pinned pages out of CMA")
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 arch/powerpc/mm/mmu_context_iommu.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/arch/powerpc/mm/mmu_context_iommu.c
+++ b/arch/powerpc/mm/mmu_context_iommu.c
@@ -184,7 +184,7 @@ long mm_iommu_get(struct mm_struct *mm,
 		 * 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),


Patches currently in stable-queue which might be from mpe@ellerman.id.au are

queue-4.10/powerpc-mm-fix-build-break-when-cma-n-spapr_tce_iommu-y.patch
queue-4.10/powerpc-perf-handle-sdar_mode-for-marked-event-in-power9.patch
queue-4.10/powerpc-perf-avoid-fab_-_match-checks-for-power9.patch
queue-4.10/powerpc-mm-fixup-wrong-lpcr_vrmasd-value.patch
queue-4.10/powerpc-correctly-disable-latent-entropy-gcc-plugin-on-prom_init.o.patch
queue-4.10/powerpc-ftrace-fix-confusing-help-text-for-disable_mprofile_kernel.patch
queue-4.10/powerpc-powernv-fix-opal_exit-tracepoint-opcode.patch
queue-4.10/powerpc-perf-fix-perf_get_data_addr-for-power9-dd1.patch