Merge tag 'iommu-updates-v4.19' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-block.git] / drivers / iommu / intel-svm.c

diff --git a/drivers/iommu/intel-svm.c b/drivers/iommu/intel-svm.c
index eb308363e5410686bc4cfe7dbbe671f1966863c8..4a03e50909520e5eb40d6245fa3e1affda769780 100644 (file)
--- a/drivers/iommu/intel-svm.c
+++ b/drivers/iommu/intel-svm.c
@@ -24,6 +24,7 @@
 #include <linux/pci-ats.h>
 #include <linux/dmar.h>
 #include <linux/interrupt.h>
+#include <linux/mm_types.h>
 #include <asm/page.h>
 
 #include "intel-pasid.h"
@@ -581,7 +582,8 @@ static irqreturn_t prq_event_thread(int irq, void *d)
                struct vm_area_struct *vma;
                struct page_req_dsc *req;
                struct qi_desc resp;
-               int ret, result;
+               int result;
+               vm_fault_t ret;
                u64 address;
 
                handled = 1;