1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
|
--- usr/src/nv/nv.c.orig
+++ usr/src/nv/nv.c
@@ -15,6 +15,7 @@
#include "nv_compiler.h"
#include "os-agp.h"
#include "nv-vm.h"
+#include <linux/version.h>
#ifdef MODULE_ALIAS_CHARDEV_MAJOR
MODULE_ALIAS_CHARDEV_MAJOR(NV_MAJOR_DEVICE_NUMBER);
@@ -499,10 +500,12 @@
* Set the module owner to ensure that the reference
* count reflects accesses to the proc files.
*/
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
proc_nvidia->owner = THIS_MODULE;
proc_nvidia_cards->owner = THIS_MODULE;
proc_nvidia_warnings->owner = THIS_MODULE;
+#endif
for (j = 0; j < num_nv_devices; j++)
{
nvl = &nv_linux_devices[j];
@@ -521,7 +524,9 @@
entry->data = nv;
entry->read_proc = nv_kern_read_cardinfo;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
entry->owner = THIS_MODULE;
+#endif
if (nvos_find_agp_capability(dev)) {
/*
@@ -534,7 +539,9 @@
goto failed;
}
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
entry->owner = THIS_MODULE;
+#endif
proc_nvidia_agp = entry;
entry = create_proc_entry("status", flags, proc_nvidia_agp);
@@ -545,7 +552,9 @@
entry->data = nv;
entry->read_proc = nv_kern_read_status;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
entry->owner = THIS_MODULE;
+#endif
entry = create_proc_entry("host-bridge", flags, proc_nvidia_agp);
if (!entry) {
@@ -555,8 +564,9 @@
entry->data = NULL;
entry->read_proc = nv_kern_read_agpinfo;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
entry->owner = THIS_MODULE;
-
+#endif
entry = create_proc_entry("card", flags, proc_nvidia_agp);
if (!entry) {
NV_PCI_DEV_PUT(dev);
@@ -565,7 +575,9 @@
entry->data = nv;
entry->read_proc = nv_kern_read_agpinfo;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
entry->owner = THIS_MODULE;
+#endif
}
NV_PCI_DEV_PUT(dev);
@@ -576,14 +588,18 @@
goto failed;
entry->read_proc = nv_kern_read_version;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
entry->owner = THIS_MODULE;
+#endif
entry = create_proc_entry("registry", flags, proc_nvidia);
if (!entry)
goto failed;
entry->read_proc = nv_kern_read_registry;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
entry->owner = THIS_MODULE;
+#endif
return;
@@ -610,7 +626,9 @@
entry->data = (void *)message;
entry->read_proc = nv_kern_read_warning;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
entry->owner = THIS_MODULE;
+#endif
#endif
}
|
