This patch fixes build error on ia64, that is introduced by the patch intel-iommu-integrate-dma-cma.patch in -mm tree, and this change should be folded into it.
Reported-by: Fengguang Wu <fengguang...@intel.com> Signed-off-by: Akinobu Mita <akinobu.m...@gmail.com> Cc: Fengguang Wu <fengguang...@intel.com> Cc: Marek Szyprowski <m.szyprow...@samsung.com> Cc: Konrad Rzeszutek Wilk <konrad.w...@oracle.com> Cc: David Woodhouse <dw...@infradead.org> Cc: Don Dutile <ddut...@redhat.com> Cc: Thomas Gleixner <t...@linutronix.de> Cc: Ingo Molnar <mi...@redhat.com> Cc: "H. Peter Anvin" <h...@zytor.com> Cc: Andi Kleen <a...@firstfloor.org> Cc: x...@kernel.org Cc: io...@lists.linux-foundation.org --- drivers/iommu/intel-iommu.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c index 8659352..6b1c33a 100644 --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel-iommu.c @@ -39,6 +39,7 @@ #include <linux/dmi.h> #include <linux/pci-ats.h> #include <linux/memblock.h> +#include <linux/dma-contiguous.h> #include <asm/irq_remapping.h> #include <asm/cacheflush.h> #include <asm/iommu.h> -- 1.8.3.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
