Author: leigh123linux Update of /cvs/nonfree/rpms/catalyst-kmod/F-16 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv10933 Modified Files: catalyst-kmod.spec fglrx_kernel_3.4.0.patch Log Message: * Sat Jun 09 2012 leigh scott <leigh123linux(a)googlemail.com&gt; - 12.4-4 - complete patch for newer kernels Index: catalyst-kmod.spec =================================================================== RCS file: /cvs/nonfree/rpms/catalyst-kmod/F-16/catalyst-kmod.spec,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- catalyst-kmod.spec 5 Jun 2012 20:22:43 -0000 1.54 +++ catalyst-kmod.spec 9 Jun 2012 23:25:33 -0000 1.55 @@ -3,7 +3,7 @@ # "buildforkernels newest" macro for just that build; immediately after # queuing that build enable the macro again for subsequent builds; that way # a new akmod package will only get build when a new one is actually needed -%define buildforkernels newest +%define buildforkernels current # Tweak to have debuginfo - part 1/2 %if 0%{?fedora} > 7 @@ -13,7 +13,7 @@ Name: catalyst-kmod Version: 12.4 -Release: 3%{?dist}.1 +Release: 4%{?dist} # Taken over by kmodtool Summary: AMD display driver kernel module Group: System Environment/Kernel @@ -105,6 +105,9 @@ %changelog +* Sat Jun 09 2012 leigh scott <leigh123linux(a)googlemail.com&gt; - 12.4-4 +- complete patch for newer kernels + * Tue Jun 05 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 12.4-3.1 - Rebuilt for updated kernel fglrx_kernel_3.4.0.patch: firegl_public.c | 7 +++++++ kcl_ioctl.c | 4 ++++ 2 files changed, 11 insertions(+) Index: fglrx_kernel_3.4.0.patch =================================================================== RCS file: /cvs/nonfree/rpms/catalyst-kmod/F-16/fglrx_kernel_3.4.0.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fglrx_kernel_3.4.0.patch 23 May 2012 15:04:20 -0000 1.2 +++ fglrx_kernel_3.4.0.patch 9 Jun 2012 23:25:33 -0000 1.3 @@ -15,10 +15,23 @@ unsigned int p; KCL_DEBUG5(FN_FIREGL_KAS, "%d\n", level_init); +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0) -+ for_each_cpu_mask(p, cpu_possible_mask) ++ for_each_possible_cpu(p) +#else for_each_cpu_mask(p, cpu_possible_map) +#endif { KCL_DEBUG1(FN_FIREGL_KAS,"Setting initial execution level for CPU # %d\n", p); preempt_disable(); +--- lib/modules/fglrx/build_mod/kcl_ioctl.c ++++ lib/modules/fglrx/build_mod/kcl_ioctl.c +@@ -217,6 +217,10 @@ + * \param size [in] Number of bytes to allocate + * \return Pointer to allocated memory + */ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0) ++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);