split kernel 4.7 compatibility patch into non-uvm and uvm parts

[packages/xorg-driver-video-nvidia.git] / linux-4.7.patch

diff --git a/linux-4.7.patch b/linux-4.7.patch
index 0dc12c8a06a782b881b1ab55c183fb4e2de9a7fb..97a0b482ae56de621d453a003f5b955317b51c3b 100644 (file)
--- a/linux-4.7.patch
+++ b/linux-4.7.patch
@@ -43,18 +43,3 @@
      if (gem == NULL)
      {
 
      if (gem == NULL)
      {
 

---- a/kernel/nvidia-uvm/uvm_linux.h
-+++ b/kernel/nvidia-uvm/uvm_linux.h
-@@ -547,7 +547,11 @@
-     INIT_RADIX_TREE(tree, GFP_NOWAIT);
- }
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
-+static bool radix_tree_is_empty(struct radix_tree_root *tree)
-+#else
- static bool radix_tree_empty(struct radix_tree_root *tree)
-+#endif
- {
-     void *dummy;
-     return radix_tree_gang_lookup(tree, &dummy, 0, 1) == 0;
-