diff options
| author | Daniel Fox Franke <dfoxfranke@gmail.com> | 2015-08-03 00:36:30 -0400 |
|---|---|---|
| committer | Daniel Fox Franke <dfoxfranke@gmail.com> | 2015-08-03 00:36:30 -0400 |
| commit | 6f2db8fe4423be2a117822016603fdaf1e2a547d (patch) | |
| tree | e9e6abb0a9330a54daf5beab041a6a45b2364d33 /pkgs/os-specific/linux/ati-drivers | |
| parent | 1d3207b27b178ea88f413dd47b195445a14adc6a (diff) | |
| download | nixpkgs-6f2db8fe4423be2a117822016603fdaf1e2a547d.tar nixpkgs-6f2db8fe4423be2a117822016603fdaf1e2a547d.tar.gz nixpkgs-6f2db8fe4423be2a117822016603fdaf1e2a547d.tar.bz2 nixpkgs-6f2db8fe4423be2a117822016603fdaf1e2a547d.tar.lz nixpkgs-6f2db8fe4423be2a117822016603fdaf1e2a547d.tar.xz nixpkgs-6f2db8fe4423be2a117822016603fdaf1e2a547d.tar.zst nixpkgs-6f2db8fe4423be2a117822016603fdaf1e2a547d.zip | |
ati-drivers: Fixes for kernel 4.1.
* IRQF_DISABLED was already a no-op in recent kernels, has now been removed. * strnicmp is renamed to strncasecmp.
Diffstat (limited to 'pkgs/os-specific/linux/ati-drivers')
| -rw-r--r-- | pkgs/os-specific/linux/ati-drivers/fglrx_3.18.19-no_hotplug_underscore_cr4.patch | 36 |
1 files changed, 31 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/ati-drivers/fglrx_3.18.19-no_hotplug_underscore_cr4.patch b/pkgs/os-specific/linux/ati-drivers/fglrx_3.18.19-no_hotplug_underscore_cr4.patch index 0d6839a1012..de1984c4c49 100644 --- a/pkgs/os-specific/linux/ati-drivers/fglrx_3.18.19-no_hotplug_underscore_cr4.patch +++ b/pkgs/os-specific/linux/ati-drivers/fglrx_3.18.19-no_hotplug_underscore_cr4.patch @@ -1,7 +1,21 @@ diff -Nru 15.7/common/lib/modules/fglrx/build_mod/firegl_public.c 15.7.new/common/lib/modules/fglrx/build_mod/firegl_public.c --- 15.7/common/lib/modules/fglrx/build_mod/firegl_public.c 2015-07-04 10:31:23.000000000 -0400 -+++ 15.7.new/common/lib/modules/fglrx/build_mod/firegl_public.c 2015-08-02 19:47:04.123014897 -0400 -@@ -4498,8 +4498,8 @@ ++++ 15.7.new/common/lib/modules/fglrx/build_mod/firegl_public.c 2015-08-03 00:30:34.927839497 -0400 +@@ -3495,10 +3495,12 @@ + KCL_PUB_InterruptHandlerWrap, + #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22) + ((useMSI) ? (SA_INTERRUPT) : (SA_SHIRQ)), +-#else ++#elif LINUX_VERSION_CODE < KERNEL_VERSION(4,1,0) + //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)), ++#else ++ ((useMSI) ? 0 : IRQF_SHARED), + #endif + dev_name, + context); +@@ -4498,8 +4500,8 @@ if (cpu_has_pge) { @@ -12,7 +26,7 @@ diff -Nru 15.7/common/lib/modules/fglrx/build_mod/firegl_public.c 15.7.new/commo } __flush_tlb(); -@@ -4512,7 +4512,7 @@ +@@ -4512,7 +4514,7 @@ write_cr0(cr0 & 0xbfffffff); if (cpu_has_pge) { @@ -21,7 +35,7 @@ diff -Nru 15.7/common/lib/modules/fglrx/build_mod/firegl_public.c 15.7.new/commo } local_irq_restore(flags); -@@ -4539,8 +4539,8 @@ +@@ -4539,8 +4541,8 @@ if (cpu_has_pge) { @@ -32,7 +46,7 @@ diff -Nru 15.7/common/lib/modules/fglrx/build_mod/firegl_public.c 15.7.new/commo } __flush_tlb(); -@@ -4552,7 +4552,7 @@ +@@ -4552,7 +4554,7 @@ write_cr0(cr0 & 0xbfffffff); if (cpu_has_pge) { @@ -56,3 +70,15 @@ diff -Nru 15.7/common/lib/modules/fglrx/build_mod/kcl_acpi.c 15.7.new/common/lib } #endif } +diff -Nru 15.7/common/lib/modules/fglrx/build_mod/kcl_str.c 15.7.new/common/lib/modules/fglrx/build_mod/kcl_str.c +--- 15.7/common/lib/modules/fglrx/build_mod/kcl_str.c 2015-07-04 10:31:23.000000000 -0400 ++++ 15.7.new/common/lib/modules/fglrx/build_mod/kcl_str.c 2015-08-03 00:35:25.938410435 -0400 +@@ -169,7 +169,7 @@ + const char* s2, + KCL_TYPE_SizeSigned count) + { +- return strnicmp(s1, s2, count); ++ return strncasecmp(s1, s2, count); + } + + /** \brief Locate character in string |