From: Jan Rękorajski <baggins@pld-linux.org>
Date: Sun, 19 Apr 2015 11:55:53 +0000 (+0200)
Subject: - fix building with linux 4.0
X-Git-Tag: auto/th/xorg-driver-video-nvidia-legacy-304xx-304.125-3
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;ds=sidebyside;h=refs%2Ftags%2Fauto%2Fth%2Fxorg-driver-video-nvidia-legacy-304xx-304.125-3;p=packages%2Fxorg-driver-video-nvidia-legacy-304xx.git

- fix building with linux 4.0
- rel 3
---

diff --git a/linux-4.0.patch b/linux-4.0.patch
new file mode 100644
index 0000000..fcbc23b
--- /dev/null
+++ b/linux-4.0.patch
@@ -0,0 +1,14 @@
+--- NVIDIA-Linux-x86_64-346.35-no-compat32/kernel/nv-linux.h~	2015-01-11 05:30:46.000000000 +0100
++++ NVIDIA-Linux-x86_64-346.35-no-compat32/kernel/nv-linux.h	2015-04-19 13:51:50.919754915 +0200
+@@ -336,6 +336,11 @@
+ #define NV_SPIN_UNLOCK(lock)      spin_unlock(lock)
+ #define NV_SPIN_UNLOCK_WAIT(lock) spin_unlock_wait(lock)
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 0, 0)
++#define read_cr4 __read_cr4
++#define write_cr4 __write_cr4
++#endif
++
+ #if defined(NVCPU_X86)
+ #ifndef write_cr4
+ #define write_cr4(x) __asm__ ("movl %0,%%cr4" :: "r" (x));
diff --git a/xorg-driver-video-nvidia-legacy-304xx.spec b/xorg-driver-video-nvidia-legacy-304xx.spec
index 86a2d50..b62a18d 100644
--- a/xorg-driver-video-nvidia-legacy-304xx.spec
+++ b/xorg-driver-video-nvidia-legacy-304xx.spec
@@ -25,7 +25,7 @@ exit 1
 
 %define		no_install_post_check_so 1
 
-%define		rel	2
+%define		rel	3
 %define		mname	nvidia-legacy-304xx
 %define		pname	xorg-driver-video-%{mname}
 Summary:	Linux Drivers for nVidia GeForce/Quadro Chips
@@ -48,6 +48,7 @@ Source5:	10-nvidia-modules.conf
 Patch0:		X11-driver-nvidia-GL.patch
 Patch1:		X11-driver-nvidia-desktop.patch
 Patch2:		linux-3.19.patch
+Patch3:		linux-4.0.patch
 URL:		http://www.nvidia.com/object/unix.html
 BuildRequires:	rpmbuild(macros) >= 1.701
 %{?with_kernel:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2}}
@@ -248,6 +249,7 @@ rm -rf NVIDIA-Linux-x86*-%{version}*
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %{?with_kernel:%{expand:%build_kernel_packages}}