Source Mage code commit list

[Ladislav Hagara <scm AT sourcemage.org>]

GIT changes to master z-rejected grimoire by Ladislav Hagara <hgr AT vabo.cz>:

 z-kernels/nvidia_legacy_340xx/HISTORY         |    3 
 z-kernels/nvidia_legacy_340xx/PRE_BUILD       |    2 
 z-kernels/nvidia_legacy_340xx/linux-4.6.patch |  150 
++++++++++++++++++++++++++
 3 files changed, 155 insertions(+)

New commits:
commit c98d80c9b2d1b384b4527512fb2b39bb622ac4b6
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

    nvidia_legacy_340xx updated to work with Linux 4.6

diff --git a/z-kernels/nvidia_legacy_340xx/HISTORY 
b/z-kernels/nvidia_legacy_340xx/HISTORY
index 5888e9a..4200eca 100644
--- a/z-kernels/nvidia_legacy_340xx/HISTORY
+++ b/z-kernels/nvidia_legacy_340xx/HISTORY
@@ -1,3 +1,6 @@
+2016-07-13 Ladislav Hagara <hgr AT vabo.cz>
+       * PRE_BUILD, linux-4.6.patch: patch form Arch added
+
 2016-02-03 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 340.96
        * PRE_BUILD, nvidia-4.2.patch, nvidia-4.3-build.patch: patches removed
diff --git a/z-kernels/nvidia_legacy_340xx/PRE_BUILD 
b/z-kernels/nvidia_legacy_340xx/PRE_BUILD
index 920f631..4fc0236 100755
--- a/z-kernels/nvidia_legacy_340xx/PRE_BUILD
+++ b/z-kernels/nvidia_legacy_340xx/PRE_BUILD
@@ -6,6 +6,8 @@ sh  $SOURCE_CACHE/$SOURCE  --extract-only                     
\
 check_tmp_noexec /tmp &&
 cd $SOURCE_DIRECTORY                                          &&
 
+patch -p1 < ${SPELL_DIRECTORY}/linux-4.6.patch  &&
+
 # Fix defunct desktop file
 sedit  's/__.*__\///'  nvidia-settings.desktop  &&
 
diff --git a/z-kernels/nvidia_legacy_340xx/linux-4.6.patch 
b/z-kernels/nvidia_legacy_340xx/linux-4.6.patch
new file mode 100644
index 0000000..0495ce1
--- /dev/null
+++ b/z-kernels/nvidia_legacy_340xx/linux-4.6.patch
@@ -0,0 +1,150 @@
+--- /dev/null
++++ b/kernel/nv-mm.h
+@@ -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__
+--- a/kernel/os-mlock.c
++++ b/kernel/os-mlock.c
+@@ -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 @@ RM_STATUS NV_API_CALL os_lock_user_pages(
+     }
+ 
+     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;
+@@ -59,7 +59,7 @@ RM_STATUS NV_API_CALL os_lock_user_pages(
+     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;
+     }
+@@ -86,7 +86,7 @@ RM_STATUS NV_API_CALL os_unlock_user_pages(
+     {
+         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 --git a/kernel/conftest.sh.orig b/kernel/conftest.sh
+index d01488b..308ea8a 100755
+--- a/kernel/conftest.sh
++++ b/kernel/conftest.sh
+@@ -1669,6 +1669,23 @@ compile_test() {
+ 
+             compile_check_conftest "$CODE" "NV_NODE_END_PFN_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"
++        ;;
+     esac
+ }
+ 
+diff --git a/kernel/Makefile.orig b/kernel/Makefile
+index 438d487..c52a36c 100644
+--- a/kernel/Makefile
++++ b/kernel/Makefile
+@@ -139,7 +139,8 @@ COMPILE_TESTS = \
+       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 --git a/kernel/uvm/nvidia_uvm_lite.c.orig b/kernel/uvm/nvidia_uvm_lite.c
+index 442a0a8..695f092 100644
+--- a/kernel/uvm/nvidia_uvm_lite.c
++++ b/kernel/uvm/nvidia_uvm_lite.c
+@@ -785,7 +785,7 @@ int _fault_common(struct vm_area_struct *vma, unsigned 
long vaddr,
+         // a reference so that the fault handling logic is correct:
+         //
+         get_page(pTracking->uvmPage);
+-        retValue = VM_FAULT_MINOR;
++        retValue = 0;
+     }
+ 
+     pRecord->isMapped = NV_TRUE;