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
9 - * The 'struct poll_wqueues' appeared in 2.5.48, when global
10 - * /dev/epoll interface was added. It was backported to the
14 -#if VMW_HAVE_EPOLL // {
15 #define compat_poll_wqueues struct poll_wqueues
17 -#define compat_poll_wqueues poll_table
20 -#if VMW_HAVE_EPOLL // {
22 /* If prototype does not match, build will abort here */
23 extern void poll_initwait(compat_poll_wqueues *);
25 poll_freewait((table)) \
28 -#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 0) // {
30 -/* If prototype does not match, build will abort here */
31 -extern void poll_initwait(compat_poll_wqueues *);
33 -#define compat_poll_initwait(wait, table) ( \
35 - poll_initwait(wait) \
38 -#define compat_poll_freewait(wait, table) ( \
39 - poll_freewait((table)) \
44 -#define compat_poll_initwait(wait, table) ( \
45 - (wait) = (table), /* confuse compiler */ \
46 - (wait) = (poll_table *) __get_free_page(GFP_KERNEL), \
48 - (wait)->entry = (struct poll_table_entry *)((wait) + 1), \
49 - (wait)->next = NULL \
53 -poll_freewait(poll_table *wait)
56 - struct poll_table_entry * entry;
59 - entry = wait->entry + wait->nr;
60 - while (wait->nr > 0) {
63 - remove_wait_queue(entry->wait_address, &entry->wait);
64 - compat_fput(entry->filp);
68 - free_page((unsigned long) old);
72 -#define compat_poll_freewait(wait, table) ( \
73 - poll_freewait((wait)) \
79 #endif /* __COMPAT_WAIT_H__ */
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
88 - * Between 2.5.70 and 2.5.71 all sock members were renamed from XXX to sk_XXX.
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
94 - * EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/socket.c, -DVMW_HAVE_SK_WMEM_ALLOC, )
96 - * in their Makefiles.
98 -#ifndef VMW_HAVE_SK_WMEM_ALLOC
99 -# define sk_wmem_alloc wmem_alloc
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
112 - * The 'struct poll_wqueues' appeared in 2.5.48, when global
113 - * /dev/epoll interface was added. It was backported to the
117 -#if VMW_HAVE_EPOLL // {
118 #define compat_poll_wqueues struct poll_wqueues
120 -#define compat_poll_wqueues poll_table
123 -#if VMW_HAVE_EPOLL // {
125 /* If prototype does not match, build will abort here */
126 extern void poll_initwait(compat_poll_wqueues *);
128 poll_freewait((table)) \
131 -#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 0) // {
133 -/* If prototype does not match, build will abort here */
134 -extern void poll_initwait(compat_poll_wqueues *);
136 -#define compat_poll_initwait(wait, table) ( \
137 - (wait) = (table), \
138 - poll_initwait(wait) \
141 -#define compat_poll_freewait(wait, table) ( \
142 - poll_freewait((table)) \
147 -#define compat_poll_initwait(wait, table) ( \
148 - (wait) = (table), /* confuse compiler */ \
149 - (wait) = (poll_table *) __get_free_page(GFP_KERNEL), \
151 - (wait)->entry = (struct poll_table_entry *)((wait) + 1), \
152 - (wait)->next = NULL \
156 -poll_freewait(poll_table *wait)
159 - struct poll_table_entry * entry;
162 - entry = wait->entry + wait->nr;
163 - while (wait->nr > 0) {
166 - remove_wait_queue(entry->wait_address, &entry->wait);
167 - compat_fput(entry->filp);
171 - free_page((unsigned long) old);
175 -#define compat_poll_freewait(wait, table) ( \
176 - poll_freewait((wait)) \
182 #endif /* __COMPAT_WAIT_H__ */