+--- kernel/nv-linux.h\r
++++ kernel/nv-linux.h\r
+@@ -2082,6 +2082,8 @@ static inline NvU64 nv_node_end_pfn(int nid)\r
+ * 2016 Dec 14:5b56d49fc31dbb0487e14ead790fc81ca9fb2c99\r
+ */\r
+\r
++#include <linux/version.h>\r
++\r
+ #if defined(NV_GET_USER_PAGES_REMOTE_PRESENT)\r
+ #if defined(NV_GET_USER_PAGES_HAS_WRITE_AND_FORCE_ARGS)\r
+ #define NV_GET_USER_PAGES get_user_pages\r
+@@ -2129,8 +2131,13 @@ static inline NvU64 nv_node_end_pfn(int nid)\r
+\r
+ #else\r
+\r
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)\r
+ return get_user_pages_remote(tsk, mm, start, nr_pages, flags,\r
+ pages, vmas);\r
++#else\r
++ return get_user_pages_remote(tsk, mm, start, nr_pages, flags,\r
++ pages, vmas, NULL);\r
++#endif\r
+\r
+ #endif\r
+\r
+--- kernel/nv-pat.c\r
++++ kernel/nv-pat.c\r
+@@ -203,6 +203,7 @@ void nv_disable_pat_support(void)\r
+ }\r
+\r
+ #if defined(NV_ENABLE_PAT_SUPPORT) && defined(NV_ENABLE_HOTPLUG_CPU)\r
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)\r
+ static int\r
+ nvidia_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)\r
+ {\r
+@@ -234,6 +235,34 @@ static struct notifier_block nv_hotcpu_nfb = {\r
+ .notifier_call = nvidia_cpu_callback,\r
+ .priority = 0\r
+ };\r
++#else\r
++static int nvidia_cpu_online(unsigned int hcpu)\r
++{\r
++ unsigned int cpu = get_cpu();\r
++ if (cpu == hcpu)\r
++ nv_setup_pat_entries(NULL);\r
++ else\r
++ NV_SMP_CALL_FUNCTION(nv_setup_pat_entries, (void *)(long int)hcpu, 1);\r
++\r
++ put_cpu();\r
++\r
++ return 0;\r
++}\r
++\r
++static int nvidia_cpu_down_prep(unsigned int hcpu)\r
++{\r
++ unsigned int cpu = get_cpu();\r
++ if (cpu == hcpu)\r
++ nv_restore_pat_entries(NULL);\r
++ else\r
++ NV_SMP_CALL_FUNCTION(nv_restore_pat_entries, (void *)(long int)hcpu, 1);\r
++\r
++ put_cpu();\r
++\r
++ return 0;\r
++}\r
++#endif\r
++\r
+ #endif\r
+\r
+ int nv_init_pat_support(nv_stack_t *sp)\r
+@@ -255,7 +284,14 @@ int nv_init_pat_support(nv_stack_t *sp)\r
+ #if defined(NV_ENABLE_PAT_SUPPORT) && defined(NV_ENABLE_HOTPLUG_CPU)\r
+ if (nv_pat_mode == NV_PAT_MODE_BUILTIN)\r
+ {\r
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)\r
+ if (register_hotcpu_notifier(&nv_hotcpu_nfb) != 0)\r
++#else\r
++ if (cpuhp_setup_state(CPUHP_AP_ONLINE_DYN,\r
++ "gpu/nvidia:online",\r
++ nvidia_cpu_online,\r
++ nvidia_cpu_down_prep) != 0)\r
++#endif\r
+ {\r
+ nv_disable_pat_support();\r
+ nv_printf(NV_DBG_ERRORS,\r
+@@ -280,7 +316,11 @@ void nv_teardown_pat_support(void)\r
+ {\r
+ nv_disable_pat_support();\r
+ #if defined(NV_ENABLE_PAT_SUPPORT) && defined(NV_ENABLE_HOTPLUG_CPU)\r
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)\r
+ unregister_hotcpu_notifier(&nv_hotcpu_nfb);\r
++#else\r
++ cpuhp_remove_state_nocalls(CPUHP_AP_ONLINE_DYN);\r
++#endif\r
+ #endif\r
+ }\r
+ }\r
+--- kernel/uvm/nvidia_uvm_lite.c\r
++++ kernel/uvm/nvidia_uvm_lite.c\r
+@@ -820,7 +820,11 @@ done:\r
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)\r
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)\r
+ {\r
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)\r
+ unsigned long vaddr = (unsigned long)vmf->virtual_address;\r
++#else\r
++ unsigned long vaddr = (unsigned long)vmf->address;\r
++#endif\r
+ struct page *page = NULL;\r
+ int retval;\r
+\r
+--- kernel/nv-drm.c 2017-03-31 03:42:21.000000000 +0200\r
++++ kernel/nv-drm.c 2017-04-06 23:53:14.273356795 +0200\r
+@@ -48,7 +48,7 @@\r
+ return -ENODEV;\r
+ }\r
+\r
+-static int nv_drm_unload(\r
++static void nv_drm_unload(\r
+ struct drm_device *dev\r
+ )\r
+ {\r
+@@ -60,7 +60,7 @@\r
+ {\r
+ BUG_ON(nvl->drm != dev);\r
+ nvl->drm = NULL;\r
+- return 0;\r
++ return;\r
+ }\r
+ }\r
+\r
+@@ -64,7 +64,7 @@\r
+ }\r
+ }\r
+\r
+- return -ENODEV;\r
++ return;\r
+ }\r
+\r
+ static void nv_gem_free(\r
+--- kernel/uvm/nvidia_uvm_linux.h 2017-03-31 03:42:21.000000000 +0200\r
++++ kernel/uvm/nvidia_uvm_linux.h 2017-04-06 23:53:14.273356795 +0200\r
+@@ -124,6 +124,7 @@\r
+ #include <linux/delay.h> /* mdelay, udelay */\r
+\r
+ #include <linux/sched.h> /* suser(), capable() replacement */\r
++#include <linux/sched/signal.h>\r
+ #include <linux/moduleparam.h> /* module_param() */\r
+ #if !defined(NV_VMWARE)\r
+ #include <asm/tlbflush.h> /* flush_tlb(), flush_tlb_all() */\r
+@@ -362,17 +363,6 @@\r
+ void address_space_init_once(struct address_space *mapping);\r
+ #endif\r
+\r
+-#if !defined(NV_FATAL_SIGNAL_PENDING_PRESENT)\r
+- static inline int __fatal_signal_pending(struct task_struct *p)\r
+- {\r
+- return unlikely(sigismember(&p->pending.signal, SIGKILL));\r
+- }\r
+-\r
+- static inline int fatal_signal_pending(struct task_struct *p)\r
+- {\r
+- return signal_pending(p) && __fatal_signal_pending(p);\r
+- }\r
+-#endif\r
+\r
+ //\r
+ // Before the current->cred structure was introduced, current->euid,\r
+--- kernel/uvm/nvidia_uvm_lite.c 2017-03-31 03:42:21.000000000 +0200\r
++++ kernel/uvm/nvidia_uvm_lite.c 2017-04-06 23:53:14.273356795 +0200\r
+@@ -818,7 +818,7 @@\r
+ }\r
+\r
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)\r
+-int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)\r
++int _fault(struct vm_fault *vmf)\r
+ {\r
+ unsigned long vaddr = (unsigned long)vmf->virtual_address;\r
+ struct page *page = NULL;\r
+@@ -828,7 +828,7 @@\r
+ struct page *page = NULL;\r
+ int retval;\r
+\r
+- retval = _fault_common(vma, vaddr, &page, vmf->flags);\r
++ retval = _fault_common(NULL, vaddr, &page, vmf->flags);\r
+\r
+ vmf->page = page;\r
+\r
+@@ -866,7 +866,7 @@\r
+ // it's dealing with anonymous mapping (see handle_pte_fault).\r
+ //\r
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)\r
+-int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)\r
++int _sigbus_fault(struct vm_fault *vmf)\r
+ {\r
+ vmf->page = NULL;\r
+ return VM_FAULT_SIGBUS;\r
+--- kernel/nv-drm.c\r
++++ kernel/nv-drm.c\r
+@@ -115,7 +115,11 @@ static const struct file_operations nv_drm_fops = {\r
+ };\r
+\r
+ static struct drm_driver nv_drm_driver = {\r
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)\r
++ .driver_features = DRIVER_GEM | DRIVER_PRIME | DRIVER_LEGACY,\r
++#else\r
+ .driver_features = DRIVER_GEM | DRIVER_PRIME,\r
++#endif\r
+ .load = nv_drm_load,\r
+ .unload = nv_drm_unload,\r
+ .fops = &nv_drm_fops,
\ No newline at end of file