Just in case anyone wants to build nvidia-kernel-dkms from Jessie with kernel 4.6, the patch attached might be useful. The original patch has been taken from http://pastebin.com/hJ2GuLdB.
Kind regards Jakob
diff -Naur /usr/src/nvidia-current-340.96.orig/conftest.h /usr/src/nvidia-current-340.96/conftest.h
--- /usr/src/nvidia-current-340.96.orig/conftest.h 2015-11-21 02:48:10.000000000 +0100
+++ /usr/src/nvidia-current-340.96/conftest.h 2016-06-22 22:35:16.325994356 +0200
@@ -664,6 +664,13 @@
#undef NV_NODE_END_PFN_PRESENT
#endif
+/* Implement conftest.sh function get_user_pages_remote */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,6,0)
+ #define NV_GET_USER_PAGES_REMOTE_PRESENT
+#else
+ #undef NV_GET_USER_PAGES_REMOTE_PRESENT
+#endif
+
/* Check for linux/semaphore.h */
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
#define NV_LINUX_SEMAPHORE_H_PRESENT
diff -Naur /usr/src/nvidia-current-340.96.orig/conftest_nvidia.sh /usr/src/nvidia-current-340.96/conftest_nvidia.sh
--- /usr/src/nvidia-current-340.96.orig/conftest_nvidia.sh 2015-11-09 06:44:53.000000000 +0100
+++ /usr/src/nvidia-current-340.96/conftest_nvidia.sh 2016-06-22 22:25:10.407749529 +0200
@@ -773,6 +773,23 @@
compile_check_conftest "$CODE" "NV_ACQUIRE_CONSOLE_SEM_PRESENT" "" "functions"
;;
+ get_user_pages_remote)
+ #
+ # Determine if the function get_user_pages_remote() is
+ # present.
+ #
+ # get_user_pages_remote() was added by:
+ # 2016 Feb 12: 1e9877902dc7e11d2be038371c6fbf2dfcd469d7
+ #
+ CODE="
+ #include <linux/mm.h>
+ int conftest_get_user_pages_remote(void) {
+ get_user_pages_remote();
+ }"
+
+ compile_check_conftest "$CODE" "NV_GET_USER_PAGES_REMOTE_PRESENT" "" "functions"
+ ;;
+
console_lock)
#
# Determine if the console_lock() function is present.
diff -Naur /usr/src/nvidia-current-340.96.orig/Kbuild /usr/src/nvidia-current-340.96/Kbuild
--- /usr/src/nvidia-current-340.96.orig/Kbuild 2015-12-15 05:19:18.000000000 +0100
+++ /usr/src/nvidia-current-340.96/Kbuild 2016-06-22 22:26:47.396740408 +0200
@@ -147,7 +147,8 @@
drm_pci_set_busid \
write_cr4 \
for_each_online_node \
- node_end_pfn
+ node_end_pfn \
+ get_user_pages_remote
#
# CFLAGS dependent on the type of builds (e.g. single/muliple module, debug)
diff -Naur /usr/src/nvidia-current-340.96.orig/nv-mm.h /usr/src/nvidia-current-340.96/nv-mm.h
--- /usr/src/nvidia-current-340.96.orig/nv-mm.h 1970-01-01 01:00:00.000000000 +0100
+++ /usr/src/nvidia-current-340.96/nv-mm.h 2016-06-22 22:23:04.946490291 +0200
@@ -0,0 +1,55 @@
+/*******************************************************************************
+ Copyright (c) 2016 NVIDIA Corporation
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to
+ deal in the Software without restriction, including without limitation the
+ rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ sell copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
+
+*******************************************************************************/
+#ifndef __NV_MM_H__
+#define __NV_MM_H__
+
+/* get_user_pages_remote() was added by:
+ * 2016 Feb 12: 1e9877902dc7e11d2be038371c6fbf2dfcd469d7
+ *
+ * The very next commit (cde70140fed8429acf7a14e2e2cbd3e329036653)
+ * deprecated the 8-argument version of get_user_pages for the
+ * non-remote case (calling get_user_pages with current and current->mm).
+ *
+ * The guidelines are: call NV_GET_USER_PAGES_REMOTE if you need the 8-argument
+ * version that uses something other than current and current->mm. Use
+ * NV_GET_USER_PAGES if you are refering to current and current->mm.
+ *
+* Note that get_user_pages_remote() requires the caller to hold a reference on
+* the task_struct (if non-NULL) and the mm_struct. This will always be true
+* when using current and current->mm. If the kernel passes the driver a vma
+* via driver callback, the kernel holds a reference on vma->vm_mm over that
+* callback.
+ */
+
+#if defined(NV_GET_USER_PAGES_REMOTE_PRESENT)
+ #define NV_GET_USER_PAGES get_user_pages
+ #define NV_GET_USER_PAGES_REMOTE get_user_pages_remote
+#else
+ #define NV_GET_USER_PAGES(start, nr_pages, write, force, pages, vmas) \
+ get_user_pages(current, current->mm, start, nr_pages, write, force, pages, vmas)
+
+ #define NV_GET_USER_PAGES_REMOTE get_user_pages
+#endif
+
+
+#endif // __NV_MM_H__
diff -Naur /usr/src/nvidia-current-340.96.orig/os-mlock.c /usr/src/nvidia-current-340.96/os-mlock.c
--- /usr/src/nvidia-current-340.96.orig/os-mlock.c 2015-11-09 06:44:53.000000000 +0100
+++ /usr/src/nvidia-current-340.96/os-mlock.c 2016-06-22 22:23:04.946490291 +0200
@@ -13,6 +13,7 @@
#include "os-interface.h"
#include "nv-linux.h"
+#include "nv-mm.h"
RM_STATUS NV_API_CALL os_lock_user_pages(
void *address,
@@ -45,7 +46,7 @@
}
down_read(&mm->mmap_sem);
- ret = get_user_pages(current, mm, (unsigned long)address,
+ ret = NV_GET_USER_PAGES((unsigned long)address,
page_count, write, force, user_pages, NULL);
up_read(&mm->mmap_sem);
pinned = ret;
@@ -58,7 +59,7 @@
else if (pinned < page_count)
{
for (i = 0; i < pinned; i++)
- page_cache_release(user_pages[i]);
+ put_page(user_pages[i]);
os_free_mem(user_pages);
return RM_ERR_INVALID_ADDRESS;
}
@@ -85,7 +86,7 @@
{
if (write)
set_page_dirty_lock(user_pages[i]);
- page_cache_release(user_pages[i]);
+ put_page(user_pages[i]);
}
os_free_mem(user_pages);
diff -Naur /usr/src/nvidia-current-340.96.orig/uvm/nvidia_uvm_lite.c /usr/src/nvidia-current-340.96/uvm/nvidia_uvm_lite.c
--- /usr/src/nvidia-current-340.96.orig/uvm/nvidia_uvm_lite.c 2015-11-09 06:44:53.000000000 +0100
+++ /usr/src/nvidia-current-340.96/uvm/nvidia_uvm_lite.c 2016-06-22 22:23:04.950490331 +0200
@@ -785,7 +785,7 @@
// a reference so that the fault handling logic is correct:
//
get_page(pTracking->uvmPage);
- retValue = VM_FAULT_MINOR;
+ retValue = 0;
}
pRecord->isMapped = NV_TRUE;
signature.asc
Description: OpenPGP digital signature
