packages: xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec, xorg-driver...

[baggins]

Author: baggins                      Date: Sun Jul  1 14:17:36 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix building with linux 3.4

---- Files affected:
packages/xorg-driver-video-fglrx:
   xorg-driver-video-fglrx.spec (1.288 -> 1.289) , kernel-3.4.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec
diff -u packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec:1.288 packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec:1.289
--- packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec:1.288	Sat Jun 23 21:50:04 2012
+++ packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec	Sun Jul  1 16:17:31 2012
@@ -56,6 +56,7 @@
 Patch5:		%{pname}-GPL-only.patch
 Patch6:		%{pname}-WARN.patch
 Patch7:		%{pname}-kernel-fpu.patch
+Patch8:		kernel-3.4.patch
 URL:		http://ati.amd.com/support/drivers/linux/linux-radeon.html
 %{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.20.2}
 BuildRequires:	rpmbuild(macros) >= 1.379
@@ -201,6 +202,7 @@
 %patch5 -p1
 %patch6 -p1
 %patch7 -p0
+%patch8 -p1
 
 install -d common{%{_prefix}/{%{_lib},bin,sbin},/etc}
 cp -a %{x11ver}%{arch_sufix}/usr/X11R6/%{_lib}/* common%{_libdir}
@@ -399,6 +401,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.289  2012/07/01 14:17:31  baggins
+- fix building with linux 3.4
+
 Revision 1.288  2012/06/23 19:50:04  arekm
 - rebuild for kernel-3.4.4-1
 - release 9 (by relup.sh)

================================================================
Index: packages/xorg-driver-video-fglrx/kernel-3.4.patch
diff -u /dev/null packages/xorg-driver-video-fglrx/kernel-3.4.patch:1.1
--- /dev/null	Sun Jul  1 16:17:36 2012
+++ packages/xorg-driver-video-fglrx/kernel-3.4.patch	Sun Jul  1 16:17:31 2012
@@ -0,0 +1,24 @@
+--- a/common/lib/modules/fglrx/build_mod/firegl_public.c	2012-05-26 18:33:25.044695179 +0200
++++ b/common/lib/modules/fglrx/build_mod/firegl_public.c	2012-05-26 18:28:39.692699095 +0200
+@@ -4154,7 +4154,7 @@
+ {
+     unsigned int p;
+     KCL_DEBUG5(FN_FIREGL_KAS, "%d\n", level_init);
+-    for_each_cpu_mask(p, cpu_possible_map)
++    for_each_possible_cpu(p)
+     {
+         KCL_DEBUG1(FN_FIREGL_KAS,"Setting initial execution level for CPU # %d\n", p);
+         preempt_disable();
+--- a/common/lib/modules/fglrx/build_mod/kcl_ioctl.c	2012-05-26 19:11:03.402987821 +0200
++++ b/common/lib/modules/fglrx/build_mod/kcl_ioctl.c	2012-05-26 19:13:00.273986422 +0200
+@@ -217,6 +217,10 @@
+  *  \param size [in] Number of bytes to allocate
+  *  \return Pointer to allocated memory
+  */
++#ifndef CONFIG_X86_X32
++DEFINE_PER_CPU(unsigned long, old_rsp);
++#endif
++
+ void* ATI_API_CALL KCL_IOCTL_AllocUserSpace32(long size)
+ {
+     void __user *ret = COMPAT_ALLOC_USER_SPACE(size);
\ No newline at end of file
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec?r1=1.288&r2=1.289