Merge pull request #86 from iyernaveenr/sgx_vma

sergeay · web-flow · commit 10a2f21142c7 · 2019-05-02T09:02:18.000+03:00
sgx_vma: return unsigned int from sgx_vma_fault
diff --git a/sgx_vma.c b/sgx_vma.c
@@ -96,7 +96,11 @@ static void sgx_vma_close(struct vm_area_struct *vma)
 	kref_put(&encl->refcount, sgx_encl_release);
 }
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,1,0))
+static unsigned int sgx_vma_fault(struct vm_fault *vmf)
+{
+	struct vm_area_struct *vma = vmf->vma;
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0))
 static int sgx_vma_fault(struct vm_fault *vmf)
 {
 	struct vm_area_struct *vma = vmf->vma;

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,11 @@ static void sgx_vma_close(struct vm_area_struct *vma)`
`96`	`96`	`kref_put(&encl->refcount, sgx_encl_release);`
`97`	`97`	`}`
`98`	`98`
`99`		`-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0))`
	`99`	`+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,1,0))`
	`100`	`+static unsigned int sgx_vma_fault(struct vm_fault *vmf)`
	`101`	`+{`
	`102`	`+ struct vm_area_struct *vma = vmf->vma;`
	`103`	`+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0))`
`100`	`104`	`static int sgx_vma_fault(struct vm_fault *vmf)`
`101`	`105`	`{`
`102`	`106`	`struct vm_area_struct *vma = vmf->vma;`