]>
Commit | Line | Data |
---|---|---|
40128672 AM |
1 | diff -urN vmmon-only.org/include/compat_wait.h vmmon-only/include/compat_wait.h |
2 | --- vmmon-only.org/include/compat_wait.h 2004-05-12 16:49:05.725457240 +0200 | |
3 | +++ vmmon-only/include/compat_wait.h 2004-05-12 17:08:13.689940112 +0200 | |
658fd07f PS |
4 | @@ -28,19 +28,7 @@ |
5 | ||
6 | #endif | |
7 | ||
8 | -/* | |
9 | - * The 'struct poll_wqueues' appeared in 2.5.48, when global | |
10 | - * /dev/epoll interface was added. It was backported to the | |
11 | - * 2.4.20-wolk4.0s. | |
12 | - */ | |
13 | - | |
14 | -#if VMW_HAVE_EPOLL // { | |
15 | #define compat_poll_wqueues struct poll_wqueues | |
16 | -#else // } { | |
17 | -#define compat_poll_wqueues poll_table | |
18 | -#endif // } | |
19 | - | |
20 | -#if VMW_HAVE_EPOLL // { | |
21 | ||
22 | /* If prototype does not match, build will abort here */ | |
23 | extern void poll_initwait(compat_poll_wqueues *); | |
24 | @@ -54,55 +42,4 @@ | |
25 | poll_freewait((table)) \ | |
26 | ) | |
27 | ||
28 | -#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 0) // { | |
29 | - | |
30 | -/* If prototype does not match, build will abort here */ | |
31 | -extern void poll_initwait(compat_poll_wqueues *); | |
32 | - | |
33 | -#define compat_poll_initwait(wait, table) ( \ | |
34 | - (wait) = (table), \ | |
35 | - poll_initwait(wait) \ | |
36 | -) | |
37 | - | |
38 | -#define compat_poll_freewait(wait, table) ( \ | |
39 | - poll_freewait((table)) \ | |
40 | -) | |
41 | - | |
42 | -#else // } { | |
43 | - | |
44 | -#define compat_poll_initwait(wait, table) ( \ | |
45 | - (wait) = (table), /* confuse compiler */ \ | |
46 | - (wait) = (poll_table *) __get_free_page(GFP_KERNEL), \ | |
47 | - (wait)->nr = 0, \ | |
48 | - (wait)->entry = (struct poll_table_entry *)((wait) + 1), \ | |
49 | - (wait)->next = NULL \ | |
50 | -) | |
51 | - | |
52 | -static INLINE void | |
53 | -poll_freewait(poll_table *wait) | |
54 | -{ | |
55 | - while (wait) { | |
56 | - struct poll_table_entry * entry; | |
57 | - poll_table *old; | |
58 | - | |
59 | - entry = wait->entry + wait->nr; | |
60 | - while (wait->nr > 0) { | |
61 | - wait->nr--; | |
62 | - entry--; | |
63 | - remove_wait_queue(entry->wait_address, &entry->wait); | |
64 | - compat_fput(entry->filp); | |
65 | - } | |
66 | - old = wait; | |
67 | - wait = wait->next; | |
68 | - free_page((unsigned long) old); | |
69 | - } | |
70 | -} | |
71 | - | |
72 | -#define compat_poll_freewait(wait, table) ( \ | |
73 | - poll_freewait((wait)) \ | |
74 | -) | |
75 | - | |
76 | -#endif // } | |
77 | - | |
78 | - | |
79 | #endif /* __COMPAT_WAIT_H__ */ | |
40128672 AM |
80 | diff -urN vmnet-only.org/compat_sock.h vmnet-only/compat_sock.h |
81 | --- vmnet-only.org/compat_sock.h 2004-05-12 16:49:09.092945304 +0200 | |
82 | +++ vmnet-only/compat_sock.h 2004-05-12 17:09:13.732812208 +0200 | |
83 | @@ -5,20 +5,4 @@ | |
84 | #include <net/sock.h> | |
85 | ||
86 | ||
87 | -/* | |
88 | - * Between 2.5.70 and 2.5.71 all sock members were renamed from XXX to sk_XXX. | |
89 | - * | |
90 | - * VMW_HAVE_SK_WMEM_ALLOC is defined in module Makefile if kernel's struct sock | |
91 | - * has sk_wmem_alloc member. See vmnet's Makefile.kernel for details. | |
92 | - * It also means that all modules including this file should do | |
93 | - * | |
94 | - * EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/socket.c, -DVMW_HAVE_SK_WMEM_ALLOC, ) | |
95 | - * | |
96 | - * in their Makefiles. | |
97 | - */ | |
98 | -#ifndef VMW_HAVE_SK_WMEM_ALLOC | |
99 | -# define sk_wmem_alloc wmem_alloc | |
100 | -#endif | |
101 | - | |
102 | - | |
103 | #endif /* __COMPAT_SOCK_H__ */ | |
104 | diff -urN vmnet-only.org/compat_wait.h vmnet-only/compat_wait.h | |
105 | --- vmnet-only.org/compat_wait.h 2004-05-12 16:49:09.092945304 +0200 | |
106 | +++ vmnet-only/compat_wait.h 2004-05-12 17:08:13.691939808 +0200 | |
658fd07f PS |
107 | @@ -28,19 +28,7 @@ |
108 | ||
109 | #endif | |
110 | ||
111 | -/* | |
112 | - * The 'struct poll_wqueues' appeared in 2.5.48, when global | |
113 | - * /dev/epoll interface was added. It was backported to the | |
114 | - * 2.4.20-wolk4.0s. | |
115 | - */ | |
116 | - | |
117 | -#if VMW_HAVE_EPOLL // { | |
118 | #define compat_poll_wqueues struct poll_wqueues | |
119 | -#else // } { | |
120 | -#define compat_poll_wqueues poll_table | |
121 | -#endif // } | |
122 | - | |
123 | -#if VMW_HAVE_EPOLL // { | |
124 | ||
125 | /* If prototype does not match, build will abort here */ | |
126 | extern void poll_initwait(compat_poll_wqueues *); | |
127 | @@ -54,55 +42,4 @@ | |
128 | poll_freewait((table)) \ | |
129 | ) | |
130 | ||
131 | -#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 0) // { | |
132 | - | |
133 | -/* If prototype does not match, build will abort here */ | |
134 | -extern void poll_initwait(compat_poll_wqueues *); | |
135 | - | |
136 | -#define compat_poll_initwait(wait, table) ( \ | |
137 | - (wait) = (table), \ | |
138 | - poll_initwait(wait) \ | |
139 | -) | |
140 | - | |
141 | -#define compat_poll_freewait(wait, table) ( \ | |
142 | - poll_freewait((table)) \ | |
143 | -) | |
144 | - | |
145 | -#else // } { | |
146 | - | |
147 | -#define compat_poll_initwait(wait, table) ( \ | |
148 | - (wait) = (table), /* confuse compiler */ \ | |
149 | - (wait) = (poll_table *) __get_free_page(GFP_KERNEL), \ | |
150 | - (wait)->nr = 0, \ | |
151 | - (wait)->entry = (struct poll_table_entry *)((wait) + 1), \ | |
152 | - (wait)->next = NULL \ | |
153 | -) | |
154 | - | |
155 | -static INLINE void | |
156 | -poll_freewait(poll_table *wait) | |
157 | -{ | |
158 | - while (wait) { | |
159 | - struct poll_table_entry * entry; | |
160 | - poll_table *old; | |
161 | - | |
162 | - entry = wait->entry + wait->nr; | |
163 | - while (wait->nr > 0) { | |
164 | - wait->nr--; | |
165 | - entry--; | |
166 | - remove_wait_queue(entry->wait_address, &entry->wait); | |
167 | - compat_fput(entry->filp); | |
168 | - } | |
169 | - old = wait; | |
170 | - wait = wait->next; | |
171 | - free_page((unsigned long) old); | |
172 | - } | |
173 | -} | |
174 | - | |
175 | -#define compat_poll_freewait(wait, table) ( \ | |
176 | - poll_freewait((wait)) \ | |
177 | -) | |
178 | - | |
179 | -#endif // } | |
180 | - | |
181 | - | |
182 | #endif /* __COMPAT_WAIT_H__ */ |