[packages/xorg-driver-video-fglrx] - fix building with linux 3.19 - rel 4

[baggins]

commit e9eceb4552156d9396cc650d71db53f8241a5cf2
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Mar 30 21:49:23 2015 +0200

    - fix building with linux 3.19
    - rel 4

 linux-3.19.patch             | 28 ++++++++++++++++++++++++++++
 xorg-driver-video-fglrx.spec |  4 +++-
 2 files changed, 31 insertions(+), 1 deletion(-)
---
diff --git a/xorg-driver-video-fglrx.spec b/xorg-driver-video-fglrx.spec
index 216e922..4f6913c 100644
--- a/xorg-driver-video-fglrx.spec
+++ b/xorg-driver-video-fglrx.spec
@@ -31,7 +31,7 @@ exit 1
 %define		betaver		1.0
 #define		rel		0.beta%{betaver}.3
 
-%define		rel		3
+%define		rel		4
 %define		pname		xorg-driver-video-fglrx
 Summary:	Linux Drivers for AMD/ATI graphics accelerators
 Summary(pl.UTF-8):	Sterowniki do akceleratorów graficznych AMD/ATI
@@ -60,6 +60,7 @@ Patch4:		%{pname}-nofinger.patch
 Patch5:		%{pname}-GPL-only.patch
 Patch6:		%{pname}-intel_iommu.patch
 Patch7:		linux-3.17.patch
+Patch8:		linux-3.19.patch
 URL:		http://ati.amd.com/support/drivers/linux/linux-radeon.html
 %{?with_kernel:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2}}
 BuildRequires:	rpmbuild(macros) >= 1.701
@@ -230,6 +231,7 @@ EOF
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 
 install -d common{%{_prefix}/{%{_lib},bin,sbin},/etc}
 cp -a %{x11ver}%{arch_sufix}/usr/X11R6/%{_lib}/* common%{_libdir}
diff --git a/linux-3.19.patch b/linux-3.19.patch
new file mode 100644
index 0000000..9f2ccbe
--- /dev/null
+++ b/linux-3.19.patch
@@ -0,0 +1,28 @@
+--- fglrx-14.501.1003/common/lib/modules/fglrx/build_mod/firegl_public.c.orig	2015-03-30 21:42:57.000000000 +0200
++++ fglrx-14.501.1003/common/lib/modules/fglrx/build_mod/firegl_public.c	2015-03-30 21:47:52.302266695 +0200
+@@ -4816,8 +4816,13 @@
+ {
+     unsigned long orig_level;
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0)
++    orig_level = __this_cpu_read(kasExecutionLevel);
++    __this_cpu_write(kasExecutionLevel, level);
++#else
+     orig_level = __get_cpu_var(kasExecutionLevel);
+     __get_cpu_var(kasExecutionLevel) = level;
++#endif
+ 
+     return orig_level;
+ }
+@@ -4829,7 +4834,11 @@
+  */
+ static unsigned long kas_GetExecutionLevel(void)
+ {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0)
++    return __this_cpu_read(kasExecutionLevel);
++#else
+     return __get_cpu_var(kasExecutionLevel);
++#endif
+ }
+ 
+ /** \brief Type definition for kas_spin_lock() parameter */
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xorg-driver-video-fglrx.git/commitdiff/e9eceb4552156d9396cc650d71db53f8241a5cf2