diff --git a/srcpkgs/catalyst/files/kolasa-3.19-get_cpu_var.patch b/srcpkgs/catalyst/files/kolasa-3.19-get_cpu_var.patch new file mode 100644 index 00000000000..5a571da9fd9 --- /dev/null +++ b/srcpkgs/catalyst/files/kolasa-3.19-get_cpu_var.patch @@ -0,0 +1,28 @@ +--- 14.12/common/lib/modules/fglrx/build_mod/firegl_public.c 2014-12-11 00:15:11.000000000 +0100 ++++ 14.12/common/lib/modules/fglrx/build_mod/firegl_public.c 2015-01-01 21:39:40.471543282 +0100 +@@ -4823,8 +4823,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; + } +@@ -4836,7 +4841,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 */ diff --git a/srcpkgs/catalyst/template b/srcpkgs/catalyst/template index 5837708e1da..9440a1cf024 100644 --- a/srcpkgs/catalyst/template +++ b/srcpkgs/catalyst/template @@ -4,7 +4,7 @@ _distver="14.12" pkgname=catalyst version=14.501.1003 -revision=5 +revision=6 maintainer="Juan RP " license="Propietary AMD license" homepage="http://www.amd.com" @@ -38,6 +38,7 @@ do_build() { cd fglrx patch -Np1 -i ${FILESDIR}/fglrx_3.17rc6-no_hotplug.patch patch -Np1 -i ${FILESDIR}/lano1106_fglrx-13.8_proc.patch + patch -Np1 -i ${FILESDIR}/kolasa-3.19-get_cpu_var.patch } do_install() { cd fglrx