projects / packages / VMware-workstation.git / blame
| Commit | Line | Data |
|---|---|---|
| 658fd07f PS |
1 | --- vmmon-only/include/compat_wait.h.orig 2003-08-06 18:12:16.000000000 +0000 |
| 2 | +++ vmmon-only/include/compat_wait.h 2004-04-14 08:50:24.930433888 +0000 | |
| 3 | @@ -28,19 +28,7 @@ | |
| 4 | ||
| 5 | #endif | |
| 6 | ||
| 7 | -/* | |
| 8 | - * The 'struct poll_wqueues' appeared in 2.5.48, when global | |
| 9 | - * /dev/epoll interface was added. It was backported to the | |
| 10 | - * 2.4.20-wolk4.0s. | |
| 11 | - */ | |
| 12 | - | |
| 13 | -#if VMW_HAVE_EPOLL // { | |
| 14 | #define compat_poll_wqueues struct poll_wqueues | |
| 15 | -#else // } { | |
| 16 | -#define compat_poll_wqueues poll_table | |
| 17 | -#endif // } | |
| 18 | - | |
| 19 | -#if VMW_HAVE_EPOLL // { | |
| 20 | ||
| 21 | /* If prototype does not match, build will abort here */ | |
| 22 | extern void poll_initwait(compat_poll_wqueues *); | |
| 23 | @@ -54,55 +42,4 @@ | |
| 24 | poll_freewait((table)) \ | |
| 25 | ) | |
| 26 | ||
| 27 | -#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 0) // { | |
| 28 | - | |
| 29 | -/* If prototype does not match, build will abort here */ | |
| 30 | -extern void poll_initwait(compat_poll_wqueues *); | |
| 31 | - | |
| 32 | -#define compat_poll_initwait(wait, table) ( \ | |
| 33 | - (wait) = (table), \ | |
| 34 | - poll_initwait(wait) \ | |
| 35 | -) | |
| 36 | - | |
| 37 | -#define compat_poll_freewait(wait, table) ( \ | |
| 38 | - poll_freewait((table)) \ | |
| 39 | -) | |
| 40 | - | |
| 41 | -#else // } { | |
| 42 | - | |
| 43 | -#define compat_poll_initwait(wait, table) ( \ | |
| 44 | - (wait) = (table), /* confuse compiler */ \ | |
| 45 | - (wait) = (poll_table *) __get_free_page(GFP_KERNEL), \ | |
| 46 | - (wait)->nr = 0, \ | |
| 47 | - (wait)->entry = (struct poll_table_entry *)((wait) + 1), \ | |
| 48 | - (wait)->next = NULL \ | |
| 49 | -) | |
| 50 | - | |
| 51 | -static INLINE void | |
| 52 | -poll_freewait(poll_table *wait) | |
| 53 | -{ | |
| 54 | - while (wait) { | |
| 55 | - struct poll_table_entry * entry; | |
| 56 | - poll_table *old; | |
| 57 | - | |
| 58 | - entry = wait->entry + wait->nr; | |
| 59 | - while (wait->nr > 0) { | |
| 60 | - wait->nr--; | |
| 61 | - entry--; | |
| 62 | - remove_wait_queue(entry->wait_address, &entry->wait); | |
| 63 | - compat_fput(entry->filp); | |
| 64 | - } | |
| 65 | - old = wait; | |
| 66 | - wait = wait->next; | |
| 67 | - free_page((unsigned long) old); | |
| 68 | - } | |
| 69 | -} | |
| 70 | - | |
| 71 | -#define compat_poll_freewait(wait, table) ( \ | |
| 72 | - poll_freewait((wait)) \ | |
| 73 | -) | |
| 74 | - | |
| 75 | -#endif // } | |
| 76 | - | |
| 77 | - | |
| 78 | #endif /* __COMPAT_WAIT_H__ */ | |
| 79 | --- vmnet-only/compat_wait.h.orig 2003-08-06 17:49:19.000000000 +0000 | |
| 80 | +++ vmnet-only/compat_wait.h 2004-04-14 08:50:57.797437344 +0000 | |
| 81 | @@ -28,19 +28,7 @@ | |
| 82 | ||
| 83 | #endif | |
| 84 | ||
| 85 | -/* | |
| 86 | - * The 'struct poll_wqueues' appeared in 2.5.48, when global | |
| 87 | - * /dev/epoll interface was added. It was backported to the | |
| 88 | - * 2.4.20-wolk4.0s. | |
| 89 | - */ | |
| 90 | - | |
| 91 | -#if VMW_HAVE_EPOLL // { | |
| 92 | #define compat_poll_wqueues struct poll_wqueues | |
| 93 | -#else // } { | |
| 94 | -#define compat_poll_wqueues poll_table | |
| 95 | -#endif // } | |
| 96 | - | |
| 97 | -#if VMW_HAVE_EPOLL // { | |
| 98 | ||
| 99 | /* If prototype does not match, build will abort here */ | |
| 100 | extern void poll_initwait(compat_poll_wqueues *); | |
| 101 | @@ -54,55 +42,4 @@ | |
| 102 | poll_freewait((table)) \ | |
| 103 | ) | |
| 104 | ||
| 105 | -#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 0) // { | |
| 106 | - | |
| 107 | -/* If prototype does not match, build will abort here */ | |
| 108 | -extern void poll_initwait(compat_poll_wqueues *); | |
| 109 | - | |
| 110 | -#define compat_poll_initwait(wait, table) ( \ | |
| 111 | - (wait) = (table), \ | |
| 112 | - poll_initwait(wait) \ | |
| 113 | -) | |
| 114 | - | |
| 115 | -#define compat_poll_freewait(wait, table) ( \ | |
| 116 | - poll_freewait((table)) \ | |
| 117 | -) | |
| 118 | - | |
| 119 | -#else // } { | |
| 120 | - | |
| 121 | -#define compat_poll_initwait(wait, table) ( \ | |
| 122 | - (wait) = (table), /* confuse compiler */ \ | |
| 123 | - (wait) = (poll_table *) __get_free_page(GFP_KERNEL), \ | |
| 124 | - (wait)->nr = 0, \ | |
| 125 | - (wait)->entry = (struct poll_table_entry *)((wait) + 1), \ | |
| 126 | - (wait)->next = NULL \ | |
| 127 | -) | |
| 128 | - | |
| 129 | -static INLINE void | |
| 130 | -poll_freewait(poll_table *wait) | |
| 131 | -{ | |
| 132 | - while (wait) { | |
| 133 | - struct poll_table_entry * entry; | |
| 134 | - poll_table *old; | |
| 135 | - | |
| 136 | - entry = wait->entry + wait->nr; | |
| 137 | - while (wait->nr > 0) { | |
| 138 | - wait->nr--; | |
| 139 | - entry--; | |
| 140 | - remove_wait_queue(entry->wait_address, &entry->wait); | |
| 141 | - compat_fput(entry->filp); | |
| 142 | - } | |
| 143 | - old = wait; | |
| 144 | - wait = wait->next; | |
| 145 | - free_page((unsigned long) old); | |
| 146 | - } | |
| 147 | -} | |
| 148 | - | |
| 149 | -#define compat_poll_freewait(wait, table) ( \ | |
| 150 | - poll_freewait((wait)) \ | |
| 151 | -) | |
| 152 | - | |
| 153 | -#endif // } | |
| 154 | - | |
| 155 | - | |
| 156 | #endif /* __COMPAT_WAIT_H__ */ |