Merge lp:~vanvugt/ubuntu/lucid/nvidia-graphics-drivers-96/fix-627022 into lp:ubuntu/lucid/nvidia-graphics-drivers-96

[Daniel van Vugt]

Fix nv.c build failure with kernels >= 2.6.36 (LP: #627022)

NVIDIA have already implemented a similar fix upstream, apparently in driver version 260.19.06 or so onward. The offending kernel change was commit b19dd42faf413b4705d4adb38521e82d73fa4249 in 2.6.36 stable.

This is the nvidia-96 version of the fix. The proposal for nvidia current is:
https://code.launchpad.net/~vanvugt/ubuntu/lucid/nvidia-graphics-drivers/fix-627022/+merge/66255

=== modified file 'debian/changelog'
--- debian/changelog	2010-04-20 08:19:07 +0000
+++ debian/changelog	2011-08-10 03:26:05 +0000
@@ -1,3 +1,9 @@
+nvidia-graphics-drivers-96 (96.43.17-0ubuntu1.1) lucid-proposed; urgency=low
+
+  * Fix nv.c build failure with kernels >= 2.6.36 (LP: #627022)
+
+ -- Daniel van Vugt <[e-mail]>  Wed, 29 Jun 2011 17:08:13 +0800
+
 nvidia-graphics-drivers-96 (96.43.17-0ubuntu1) lucid; urgency=low
 
   * New upstream release:

=== modified file 'debian/dkms.conf'
--- debian/dkms.conf	2010-04-20 08:19:07 +0000
+++ debian/dkms.conf	2011-08-10 03:26:05 +0000
@@ -6,6 +6,8 @@
 MAKE[0]="make module KERNDIR=/lib/modules/$kernelver IGNORE_XEN_PRESENCE=1 IGNORE_CC_MISMATCH=1 SYSSRC=$kernel_source_dir"
 DEST_MODULE_LOCATION[0]="/kernel/drivers/char/drm"
 AUTOINSTALL="yes"
+PATCH[0]="nvidia-96-missing-field-ioctl-2.6.36.patch"
+PATCH_MATCH[0]="^(2.6.3[6-9]|3.)"
 #PATCH[0]="fall_back_on_mtrr_if_no_pat.patch"
 #PATCH_MATCH[0]="2.6.31"
 #PATCH[1]="nvidia-rt-compat-legacy.patch"

=== modified file 'debian/dkms.conf.in'
--- debian/dkms.conf.in	2010-04-11 17:03:16 +0000
+++ debian/dkms.conf.in	2011-08-10 03:26:05 +0000
@@ -6,6 +6,8 @@
 MAKE[0]="make module KERNDIR=/lib/modules/$kernelver IGNORE_XEN_PRESENCE=1 IGNORE_CC_MISMATCH=1 SYSSRC=$kernel_source_dir"
 DEST_MODULE_LOCATION[0]="/kernel/drivers/char/drm"
 AUTOINSTALL="yes"
+PATCH[0]="nvidia-96-missing-field-ioctl-2.6.36.patch"
+PATCH_MATCH[0]="^(2.6.3[6-9]|3.)"
 #PATCH[0]="fall_back_on_mtrr_if_no_pat.patch"
 #PATCH_MATCH[0]="2.6.31"
 #PATCH[1]="nvidia-rt-compat-legacy.patch"

=== added file 'debian/dkms/patches/nvidia-96-missing-field-ioctl-2.6.36.patch'
--- debian/dkms/patches/nvidia-96-missing-field-ioctl-2.6.36.patch	1970-01-01 00:00:00 +0000
+++ debian/dkms/patches/nvidia-96-missing-field-ioctl-2.6.36.patch	2011-08-10 03:26:05 +0000
@@ -0,0 +1,22 @@
+Description: Fix nv.c build failure with kernels >= 2.6.36
+ This is the nvidia-96 compatible version of the fix.
+ NVIDIA have already implemented a similar fix upstream, apparently in
+ driver version 260.19.06 or so onward. The offending kernel change was commit
+ b19dd42faf413b4705d4adb38521e82d73fa4249 in 2.6.36 stable.
+Author: Daniel van Vugt <[e-mail]>
+Bug-Ubuntu: https://launchpad.net/bugs/627022
+Origin: other
+Forwarded: not-needed
+
+--- a/nv.c
++++ b/nv.c
+@@ -241,7 +241,9 @@
+ static struct file_operations nv_fops = {
+     .owner     = THIS_MODULE,
+     .poll      = nv_kern_poll,
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 36))
+     .ioctl     = nv_kern_ioctl,
++#endif
+ #if defined(HAVE_UNLOCKED_IOCTL)
+     .unlocked_ioctl = nv_kern_unlocked_ioctl,
+ #endif