rpms/catalyst-kmod/devel kernel_4.1-remove-IRQF_DISABLED.patch, NONE, 1.1 catalyst-kmod.spec, 1.22, 1.23

Author: leigh123linux Update of /cvs/nonfree/rpms/catalyst-kmod/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv19481 Modified Files: catalyst-kmod.spec Added Files: kernel_4.1-remove-IRQF_DISABLED.patch Log Message: * Mon Jul 13 2015 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 1:15.7-2 - Patch for 4.1 kernel kernel_4.1-remove-IRQF_DISABLED.patch: firegl_public.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) --- NEW FILE kernel_4.1-remove-IRQF_DISABLED.patch --- --- lib/modules/fglrx/build_mod/firegl_public.c 2015-07-04 15:31:23.000000000 +0100 +++ lib/modules/fglrx/build_mod/firegl_public.c 2015-07-13 17:22:23.850772235 +0100 @@ -3498,7 +3498,11 @@ int ATI_API_CALL KCL_InstallInterruptHan #else //when MSI enabled. keep irq disabled when calling the action handler, //exclude this IRQ from irq balancing (only on one CPU) - ((useMSI) ? (IRQF_DISABLED) : (IRQF_SHARED)), +#if LINUX_VERSION_CODE < KERNEL_VERSION(4,1,0) + ((useMSI) ? (IRQF_DISABLED) : (IRQF_SHARED)), +#else + ((useMSI) ? : (IRQF_SHARED)), +#endif #endif dev_name, context); Index: catalyst-kmod.spec =================================================================== RCS file: /cvs/nonfree/rpms/catalyst-kmod/devel/catalyst-kmod.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- catalyst-kmod.spec 11 Jul 2015 15:54:53 -0000 1.22 +++ catalyst-kmod.spec 13 Jul 2015 16:39:21 -0000 1.23 @@ -14,7 +14,7 @@ Name: catalyst-kmod Epoch: 1 Version: 15.7 -Release: 1%{?dist} +Release: 2%{?dist} # Taken over by kmodtool Summary: AMD display driver kernel module Group: System Environment/Kernel @@ -24,6 +24,7 @@ Source11: catalyst-kmodtool-excludekernel-filterfile Patch0: compat_alloc-Makefile.patch Patch1: kernel_4.0-cr4-strn.patch +Patch2: kernel_4.1-remove-IRQF_DISABLED.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -71,6 +72,7 @@ pushd fglrxpkg %patch0 -p0 -b.compat_alloc %patch1 -p0 +%patch2 -p0 popd for kernel_version in %{?kernel_versions} ; do @@ -101,6 +103,9 @@ %changelog +* Mon Jul 13 2015 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 1:15.7-2 +- Patch for 4.1 kernel + * Sat Jul 11 2015 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 15.7-1 - Update to Catalyst 15.7 (internal version 15.20.1046)