Merge pull request #1 from jovanbulck/master

Fixed compililation errors for Linux >4.6.4.
fortanix · Aug 16, 2016 · 37d9282 · 37d9282
2 parents 0fb8995 + c8ace80
commit 37d9282
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/isgx.h b/isgx.h
@@ -22,6 +22,7 @@
 #include <linux/rwsem.h>
 #include <linux/sched.h>
 #include <linux/workqueue.h>
+#include <linux/version.h>
 
 /* Number of times to spin before going to sleep because of an interrupt
  * storm.

diff --git a/isgx_util.c b/isgx_util.c
@@ -100,7 +100,12 @@ struct page *isgx_get_backing_page(struct isgx_enclave* enclave,
 
 	backing_addr = enclave->backing + entry->addr - enclave->base;
 
-	ret = get_user_pages(enclave->owner,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,6,4)
+	ret = get_user_pages_remote(
+#else
+	ret = get_user_pages(
+#endif
+			     enclave->owner,
 			     enclave->mm,
 			     backing_addr,
 			     1, /* nr_pages */