pyrox.dev
Only use underscored versions of read_cr4 and write_cr4 in 3.18 and above.
I'm not sure precisely in what micro-version the API change was made, so
the check for 3.18.0 and above may not be quite correct. But it's at
least sufficient for every version currently included in NixOS.
+21
-6
pkgs/os-specific/linux/ati-drivers/kernel-api-fixes.patch
+21
-6
pkgs/os-specific/linux/ati-drivers/kernel-api-fixes.patch
···
1
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
2
--- 15.7/common/lib/modules/fglrx/build_mod/firegl_public.c 2015-07-04 10:31:23.000000000 -0400
3
-
+++ 15.7.new/common/lib/modules/fglrx/build_mod/firegl_public.c 2015-08-03 00:30:34.927839497 -0400
4
-
@@ -3495,10 +3495,12 @@
5
KCL_PUB_InterruptHandlerWrap,
6
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)
7
((useMSI) ? (SA_INTERRUPT) : (SA_SHIRQ)),
···
15
#endif
16
dev_name,
17
context);
18
-
@@ -4498,8 +4500,8 @@
19
20
if (cpu_has_pge)
21
{
···
26
}
27
__flush_tlb();
28
29
-
@@ -4512,7 +4514,7 @@
30
write_cr0(cr0 & 0xbfffffff);
31
if (cpu_has_pge)
32
{
···
35
}
36
local_irq_restore(flags);
37
38
-
@@ -4539,8 +4541,8 @@
39
40
if (cpu_has_pge)
41
{
···
46
}
47
__flush_tlb();
48
49
-
@@ -4552,7 +4554,7 @@
50
write_cr0(cr0 & 0xbfffffff);
51
if (cpu_has_pge)
52
{
···
1
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
2
--- 15.7/common/lib/modules/fglrx/build_mod/firegl_public.c 2015-07-04 10:31:23.000000000 -0400
3
+
+++ 15.7.new/common/lib/modules/fglrx/build_mod/firegl_public.c 2015-08-03 21:21:13.893211082 -0400
4
+
@@ -242,6 +242,14 @@
5
+
#endif
6
+
7
+
// ============================================================
8
+
+
9
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,18,0)
10
+
+#define __read_cr4 read_cr4
11
+
+#define __write_cr4 write_cr4
12
+
+#endif
13
+
+
14
+
+// ============================================================
15
+
+
16
+
/* globals */
17
+
18
+
char* firegl = NULL;
19
+
@@ -3495,10 +3503,12 @@
20
KCL_PUB_InterruptHandlerWrap,
21
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)
22
((useMSI) ? (SA_INTERRUPT) : (SA_SHIRQ)),
···
30
#endif
31
dev_name,
32
context);
33
+
@@ -4498,8 +4508,8 @@
34
35
if (cpu_has_pge)
36
{
···
41
}
42
__flush_tlb();
43
44
+
@@ -4512,7 +4522,7 @@
45
write_cr0(cr0 & 0xbfffffff);
46
if (cpu_has_pge)
47
{
···
50
}
51
local_irq_restore(flags);
52
53
+
@@ -4539,8 +4549,8 @@
54
55
if (cpu_has_pge)
56
{
···
61
}
62
__flush_tlb();
63
64
+
@@ -4552,7 +4562,7 @@
65
write_cr0(cr0 & 0xbfffffff);
66
if (cpu_has_pge)
67
{