4.11

3 files changed, 30 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 31bec49bd2b5..b1ca57ce5691 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -9,8 +9,10 @@ pkgbase = nvidia-full-beta
 	options = !strip
 	source = 10-nvidia-drm-outputclass.conf
 	source = 20-nvidia.conf
+	source = linux-4.11.patch
 	md5sums = 4f5562ee8f3171769e4638b35396c55d
 	md5sums = 2640eac092c220073f0668a7aaff61f7
+	md5sums = cc8941b6898d9daa0fb67371f57a56b6
 	source_i686 = http://us.download.nvidia.com/XFree86/Linux-x86/381.22/NVIDIA-Linux-x86-381.22.run
 	md5sums_i686 = 8825cec1640739521689bd80121d1425
 	source_x86_64 = http://us.download.nvidia.com/XFree86/Linux-x86_64/381.22/NVIDIA-Linux-x86_64-381.22-no-compat32.run
diff --git a/PKGBUILD b/PKGBUILD
index 08c6fbbd72d1..96ff00efcff1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -27,13 +27,13 @@ fi
 
 # Source
 source=('10-nvidia-drm-outputclass.conf'
-        '20-nvidia.conf')
-#        'linux-4.11.patch')
+        '20-nvidia.conf'
+        'linux-4.11.patch')
 source_i686=("http://us.download.nvidia.com/XFree86/Linux-x86/$pkgver/NVIDIA-Linux-x86-$pkgver.run")
 source_x86_64=("http://us.download.nvidia.com/XFree86/Linux-x86_64/$pkgver/$_pkg.run")
 md5sums=('4f5562ee8f3171769e4638b35396c55d'
-         '2640eac092c220073f0668a7aaff61f7')
-#         '897d9775dc484ab37934e7b102c5b325')
+         '2640eac092c220073f0668a7aaff61f7'
+         'cc8941b6898d9daa0fb67371f57a56b6')
 md5sums_i686=('8825cec1640739521689bd80121d1425')
 md5sums_x86_64=('0e9590d48703c8baa034b6f0f8bbf1e5')
 [[ $_pkg = NVIDIA-Linux-x86_64-$pkgver ]] && md5sums_x86_64=('1b74150e84fd99cc1207a51b9327112c')
diff --git a/linux-4.11.patch b/linux-4.11.patch
new file mode 100644
index 000000000000..dd6e508cfea2
--- /dev/null
+++ b/linux-4.11.patch
@@ -0,0 +1,24 @@
+--- a/kernel/nvidia-drm/nvidia-drm-linux.c
++++ b/kernel/nvidia-drm/nvidia-drm-linux.c
+@@ -20,6 +20,8 @@
+  * DEALINGS IN THE SOFTWARE.
+  */
+ 
++#include <linux/version.h>
++
+ #include <linux/module.h>
+ #include <linux/slab.h>
+ #include <linux/err.h>
+@@ -196,7 +198,11 @@
+ module_exit(nv_linux_drm_exit);
+ 
+ #if defined(MODULE_LICENSE)
++#if LINUX_VERSION_CODE > KERNEL_VERSION(4, 10, 0)
++  MODULE_LICENSE("Dual MIT/GPL");
++#else
+   MODULE_LICENSE("MIT");
++#endif
+ #endif
+ #if defined(MODULE_INFO)
+   MODULE_INFO(supported, "external");
+