Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Vadim Kuznetsov (vadimk)" <vadimk@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-emulation/vmware-modules/files: 1.0.0.24-autoconf-generated.patch 1.0.0.25-autoconf-generated.patch
Date: Fri, 26 Feb 2010 14:54:38
Message-Id: E1Nl1aM-0000tz-2t@stork.gentoo.org
1 vadimk 10/02/26 14:54:34
2
3 Added: 1.0.0.24-autoconf-generated.patch
4 1.0.0.25-autoconf-generated.patch
5 Log:
6 Bug 301320
7 (Portage version: 2.1.7.17/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 app-emulation/vmware-modules/files/1.0.0.24-autoconf-generated.patch
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-modules/files/1.0.0.24-autoconf-generated.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-modules/files/1.0.0.24-autoconf-generated.patch?rev=1.1&content-type=text/plain
14
15 Index: 1.0.0.24-autoconf-generated.patch
16 ===================================================================
17 --- vmblock-only/autoconf/cachecreate.c 2009-03-27 06:34:29.000000000 +0100
18 +++ vmblock-only/autoconf/cachecreate.c.new 2010-02-05 23:29:47.077574422 +0100
19 @@ -16,8 +16,12 @@
20 *
21 *********************************************************/
22
23 -#include <linux/autoconf.h>
24 #include <linux/version.h>
25 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
26 +#include <linux/autoconf.h>
27 +#else
28 +#include <generated/autoconf.h>
29 +#endif
30
31 /*
32 * All kernels before 2.6.22 take 6 arguments. All kernels since
33 --- vmblock-only/autoconf/cachector.c 2009-03-27 06:34:29.000000000 +0100
34 +++ vmblock-only/autoconf/cachector.c.new 2010-02-05 23:32:39.086240477 +0100
35 @@ -16,8 +16,12 @@
36 *
37 *********************************************************/
38
39 -#include <linux/autoconf.h>
40 #include <linux/version.h>
41 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
42 +#include <linux/autoconf.h>
43 +#else
44 +#include <generated/autoconf.h>
45 +#endif
46
47 /*
48 * Between 2.6.23 and 2.6.24-rc1 ctor prototype was changed from
49 --- vmblock-only/autoconf/cachector1.c 2009-03-27 06:34:29.000000000 +0100
50 +++ vmblock-only/autoconf/cachector1.c.new 2010-02-05 23:33:57.863050887 +0100
51 @@ -16,8 +16,12 @@
52 *
53 *********************************************************/
54
55 -#include <linux/autoconf.h>
56 #include <linux/version.h>
57 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
58 +#include <linux/autoconf.h>
59 +#else
60 +#include <generated/autoconf.h>
61 +#endif
62
63 /*
64 * Between 2.6.27-rc1 and 2.6.27-rc2 ctor prototype was changed from
65 --- vmblock-only/autoconf/epoll.c 2009-03-27 06:34:29.000000000 +0100
66 +++ vmblock-only/autoconf/epoll.c.new 2010-02-05 23:34:03.782195888 +0100
67 @@ -22,8 +22,12 @@
68 * never had it, but some distros backported epoll patch.
69 */
70
71 -#include <linux/autoconf.h>
72 #include <linux/version.h>
73 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
74 +#include <linux/autoconf.h>
75 +#else
76 +#include <generated/autoconf.h>
77 +#endif
78
79 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
80 #include <linux/poll.h>
81 --- vmblock-only/autoconf/filldir1.c 2009-03-27 06:34:29.000000000 +0100
82 +++ vmblock-only/autoconf/filldir1.c.new 2010-02-05 23:34:09.582480900 +0100
83 @@ -16,8 +16,12 @@
84 *
85 *********************************************************/
86
87 -#include <linux/autoconf.h>
88 #include <linux/version.h>
89 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
90 +#include <linux/autoconf.h>
91 +#else
92 +#include <generated/autoconf.h>
93 +#endif
94
95 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20)
96 #include <linux/fs.h>
97 --- vmblock-only/autoconf/geninclude.c 2009-03-27 06:34:29.000000000 +0100
98 +++ vmblock-only/autoconf/geninclude.c.new 2010-02-05 23:34:16.775702411 +0100
99 @@ -16,7 +16,12 @@
100 *
101 *********************************************************/
102
103 +#include <linux/version.h>
104 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
105 #include <linux/autoconf.h>
106 +#else
107 +#include <generated/autoconf.h>
108 +#endif
109
110 #ifdef CONFIG_X86_VOYAGER
111 APATH/mach-voyager
112 --- vmblock-only/autoconf/getsb1.c 2009-03-27 06:34:29.000000000 +0100
113 +++ vmblock-only/autoconf/getsb1.c.new 2010-02-05 23:34:21.727106345 +0100
114 @@ -16,8 +16,12 @@
115 *
116 *********************************************************/
117
118 -#include <linux/autoconf.h>
119 #include <linux/version.h>
120 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
121 +#include <linux/autoconf.h>
122 +#else
123 +#include <generated/autoconf.h>
124 +#endif
125
126 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19)
127
128 --- vmblock-only/autoconf/setnice.c 2009-03-27 06:34:29.000000000 +0100
129 +++ vmblock-only/autoconf/setnice.c.new 2010-02-05 23:34:27.326719885 +0100
130 @@ -20,8 +20,12 @@
131 * set_user_nice appeared in 2.4.21. But some distros
132 * backported it to older kernels.
133 */
134 -#include <linux/autoconf.h>
135 #include <linux/version.h>
136 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
137 +#include <linux/autoconf.h>
138 +#else
139 +#include <generated/autoconf.h>
140 +#endif
141
142 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 21)
143 #include <linux/sched.h>
144 --- vmblock-only/autoconf/statfs1.c 2009-03-27 06:34:29.000000000 +0100
145 +++ vmblock-only/autoconf/statfs1.c.new 2010-02-05 23:34:34.998496715 +0100
146 @@ -16,8 +16,12 @@
147 *
148 *********************************************************/
149
150 -#include <linux/autoconf.h>
151 #include <linux/version.h>
152 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
153 +#include <linux/autoconf.h>
154 +#else
155 +#include <generated/autoconf.h>
156 +#endif
157
158 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19)
159 #include <linux/fs.h>
160 --- vmblock-only/include/driver-config.h.old 2010-02-03 00:12:31.439000354 +0100
161 +++ vmblock-only/include/driver-config.h 2010-02-03 00:13:29.608823892 +0100
162 @@ -32,7 +32,12 @@
163 #define INCLUDE_ALLOW_VMNIXMOD
164 #include "includeCheck.h"
165
166 +#include <linux/version.h>
167 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
168 #include <linux/autoconf.h>
169 +#else
170 +#include <generated/autoconf.h>
171 +#endif
172 #include "compat_version.h"
173
174 /*
175 --- vmci-only/autoconf/epoll.c 2009-03-27 06:34:31.000000000 +0100
176 +++ vmci-only/autoconf/epoll.c.new 2010-02-05 23:38:31.793973380 +0100
177 @@ -22,8 +22,12 @@
178 * never had it, but some distros backported epoll patch.
179 */
180
181 -#include <linux/autoconf.h>
182 #include <linux/version.h>
183 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
184 +#include <linux/autoconf.h>
185 +#else
186 +#include <generated/autoconf.h>
187 +#endif
188
189 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
190 #include <linux/poll.h>
191 --- vmci-only/autoconf/geninclude.c 2009-03-27 06:34:31.000000000 +0100
192 +++ vmci-only/autoconf/geninclude.c.new 2010-02-05 23:38:45.704327021 +0100
193 @@ -16,7 +16,12 @@
194 *
195 *********************************************************/
196
197 +#include <linux/version.h>
198 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
199 #include <linux/autoconf.h>
200 +#else
201 +#include <generated/autoconf.h>
202 +#endif
203
204 #ifdef CONFIG_X86_VOYAGER
205 APATH/mach-voyager
206 --- vmci-only/include/driver-config.h.old 2010-02-03 00:12:31.439000354 +0100
207 +++ vmci-only/include/driver-config.h 2010-02-03 00:13:29.608823892 +0100
208 @@ -32,7 +32,12 @@
209 #define INCLUDE_ALLOW_VMNIXMOD
210 #include "includeCheck.h"
211
212 +#include <linux/version.h>
213 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
214 #include <linux/autoconf.h>
215 +#else
216 +#include <generated/autoconf.h>
217 +#endif
218 #include "compat_version.h"
219
220 /*
221 --- vmmon-only/autoconf/epoll.c 2010-02-05 23:39:45.361576611 +0100
222 +++ vmmon-only/autoconf/epoll.c.new 2010-02-05 23:40:41.241245910 +0100
223 @@ -22,8 +22,12 @@
224 * never had it, but some distros backported epoll patch.
225 */
226
227 -#include <linux/autoconf.h>
228 #include <linux/version.h>
229 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
230 +#include <linux/autoconf.h>
231 +#else
232 +#include <generated/autoconf.h>
233 +#endif
234
235 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
236 #include <linux/poll.h>
237 --- vmmon-only/autoconf/geninclude.c 2010-02-05 23:39:45.362577852 +0100
238 +++ vmmon-only/autoconf/geninclude.c.new 2010-02-05 23:40:50.833402279 +0100
239 @@ -16,7 +16,12 @@
240 *
241 *********************************************************/
242
243 +#include <linux/version.h>
244 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
245 #include <linux/autoconf.h>
246 +#else
247 +#include <generated/autoconf.h>
248 +#endif
249
250 #ifdef CONFIG_X86_VOYAGER
251 APATH/mach-voyager
252 --- vmmon-only/autoconf/nopage1.c 2010-02-05 23:39:45.363577625 +0100
253 +++ vmmon-only/autoconf/nopage1.c.new 2010-02-05 23:40:58.674161808 +0100
254 @@ -21,8 +21,12 @@
255 * it uses new prototype. For 2.6.1 (and its -rc) and older do
256 * compile test.
257 */
258 -#include <linux/autoconf.h>
259 #include <linux/version.h>
260 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
261 +#include <linux/autoconf.h>
262 +#else
263 +#include <generated/autoconf.h>
264 +#endif
265
266 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 2)
267 #include <linux/mm.h>
268 --- vmmon-only/autoconf/setnice.c 2010-02-05 23:39:45.363577625 +0100
269 +++ vmmon-only/autoconf/setnice.c.new 2010-02-05 23:41:12.017985901 +0100
270 @@ -20,8 +20,12 @@
271 * set_user_nice appeared in 2.4.21. But some distros
272 * backported it to older kernels.
273 */
274 -#include <linux/autoconf.h>
275 #include <linux/version.h>
276 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
277 +#include <linux/autoconf.h>
278 +#else
279 +#include <generated/autoconf.h>
280 +#endif
281
282 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 21)
283 #include <linux/sched.h>
284 --- vmmon-only/autoconf/smpcall.c 2010-02-05 23:39:45.364577754 +0100
285 +++ vmmon-only/autoconf/smpcall.c.new 2010-02-05 23:40:25.057954672 +0100
286 @@ -21,8 +21,12 @@
287 * Change happened between 2.6.26 and 2.6.27-rc1.
288 */
289
290 -#include <linux/autoconf.h>
291 #include <linux/version.h>
292 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
293 +#include <linux/autoconf.h>
294 +#else
295 +#include <generated/autoconf.h>
296 +#endif
297
298 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26)
299 # error This compile test intentionally fails.
300 --- vmmon-only/include/driver-config.h.old 2010-02-03 00:12:31.439000354 +0100
301 +++ vmmon-only/include/driver-config.h 2010-02-03 00:13:29.608823892 +0100
302 @@ -32,7 +32,12 @@
303 #define INCLUDE_ALLOW_VMNIXMOD
304 #include "includeCheck.h"
305
306 +#include <linux/version.h>
307 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
308 #include <linux/autoconf.h>
309 +#else
310 +#include <generated/autoconf.h>
311 +#endif
312 #include "compat_version.h"
313
314 /*
315 --- vmnet-only/epoll.c 2009-03-27 06:34:28.000000000 +0100
316 +++ vmnet-only/epoll.c.new 2010-02-05 23:43:43.642940246 +0100
317 @@ -22,8 +22,12 @@
318 * never had it, but some distros backported epoll patch.
319 */
320
321 -#include <linux/autoconf.h>
322 #include <linux/version.h>
323 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
324 +#include <linux/autoconf.h>
325 +#else
326 +#include <generated/autoconf.h>
327 +#endif
328
329 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
330 #include <linux/poll.h>
331 --- vmnet-only/geninclude.c 2009-03-27 06:34:28.000000000 +0100
332 +++ vmnet-only/geninclude.c.new 2010-02-05 23:43:52.931081128 +0100
333 @@ -16,7 +16,12 @@
334 *
335 *********************************************************/
336
337 +#include <linux/version.h>
338 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
339 #include <linux/autoconf.h>
340 +#else
341 +#include <generated/autoconf.h>
342 +#endif
343
344 #ifdef CONFIG_X86_VOYAGER
345 APATH/mach-voyager
346 --- vmnet-only/netdev_has_dev_net.c 2009-03-27 06:34:28.000000000 +0100
347 +++ vmnet-only/netdev_has_dev_net.c.new 2010-02-05 23:44:11.315557541 +0100
348 @@ -21,8 +21,12 @@
349 * It appeared between 2.6.25 and 2.6.26-rc1.
350 */
351
352 -#include <linux/autoconf.h>
353 #include <linux/version.h>
354 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
355 +#include <linux/autoconf.h>
356 +#else
357 +#include <generated/autoconf.h>
358 +#endif
359
360 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25)
361 # error This compile test intentionally fails.
362 --- vmnet-only/netdev_has_net.c 2009-03-27 06:34:28.000000000 +0100
363 +++ vmnet-only/netdev_has_net.c.new 2010-02-05 23:44:29.348948588 +0100
364 @@ -27,8 +27,12 @@
365 * as hopefully in few weeks all 2.6.24-rc1 users will be gone.
366 */
367
368 -#include <linux/autoconf.h>
369 #include <linux/version.h>
370 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
371 +#include <linux/autoconf.h>
372 +#else
373 +#include <generated/autoconf.h>
374 +#endif
375
376 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 23)
377 # error This compile test intentionally fails.
378 --- vmnet-only/nfhook_uses_skb.c 2009-03-27 06:34:28.000000000 +0100
379 +++ vmnet-only/nfhook_uses_skb.c.new 2010-02-05 23:44:35.228702615 +0100
380 @@ -23,8 +23,12 @@
381 * 2.6.24-rc1.
382 */
383
384 -#include <linux/autoconf.h>
385 #include <linux/version.h>
386 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
387 +#include <linux/autoconf.h>
388 +#else
389 +#include <generated/autoconf.h>
390 +#endif
391
392 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 23)
393 # error This compile test intentionally fails.
394 --- vmnet-only/setnice.c 2009-03-27 06:34:28.000000000 +0100
395 +++ vmnet-only/setnice.c.new 2010-02-05 23:44:45.613286546 +0100
396 @@ -20,8 +20,12 @@
397 * set_user_nice appeared in 2.4.21. But some distros
398 * backported it to older kernels.
399 */
400 -#include <linux/autoconf.h>
401 #include <linux/version.h>
402 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
403 +#include <linux/autoconf.h>
404 +#else
405 +#include <generated/autoconf.h>
406 +#endif
407
408 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 21)
409 #include <linux/sched.h>
410 --- vmnet-only/sk_alloc.c 2009-03-27 06:34:28.000000000 +0100
411 +++ vmnet-only/sk_alloc.c.new 2010-02-05 23:44:59.796490045 +0100
412 @@ -21,8 +21,12 @@
413 * This API change was introduced between 2.6.12-rc1 and 2.6.12-rc2.
414 */
415
416 -#include <linux/autoconf.h>
417 #include <linux/version.h>
418 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
419 +#include <linux/autoconf.h>
420 +#else
421 +#include <generated/autoconf.h>
422 +#endif
423
424 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 13)
425 #include <net/sock.h>
426 --- vmnet-only/skblin.c 2009-03-27 06:34:28.000000000 +0100
427 +++ vmnet-only/skblin.c.new 2010-02-05 23:45:17.276123591 +0100
428 @@ -20,8 +20,12 @@
429 * Detect whether skb_linearize takes one or two arguments.
430 */
431
432 -#include <linux/autoconf.h>
433 #include <linux/version.h>
434 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
435 +#include <linux/autoconf.h>
436 +#else
437 +#include <generated/autoconf.h>
438 +#endif
439
440 #if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 17)
441 /*
442 --- vmnet-only/socket.c 2009-03-27 06:34:28.000000000 +0100
443 +++ vmnet-only/socket.c.new 2010-02-05 23:45:30.149065913 +0100
444 @@ -21,8 +21,12 @@
445 * It got renamed from wmem_alloc sometime during 2.5.x.
446 */
447
448 -#include <linux/autoconf.h>
449 #include <linux/version.h>
450 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
451 +#include <linux/autoconf.h>
452 +#else
453 +#include <generated/autoconf.h>
454 +#endif
455
456 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
457 #include <net/sock.h>
458 --- vmnet-only/driver-config.h.old 2010-02-03 00:12:31.439000354 +0100
459 +++ vmnet-only/driver-config.h 2010-02-03 00:13:29.608823892 +0100
460 @@ -32,7 +32,12 @@
461 #define INCLUDE_ALLOW_VMNIXMOD
462 #include "includeCheck.h"
463
464 +#include <linux/version.h>
465 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
466 #include <linux/autoconf.h>
467 +#else
468 +#include <generated/autoconf.h>
469 +#endif
470 #include "compat_version.h"
471
472 /*
473 --- vsock-only/autoconf/cachecreate.c 2009-03-27 06:34:32.000000000 +0100
474 +++ vsock-only/autoconf/cachecreate.c.new 2010-02-05 23:46:29.157369452 +0100
475 @@ -16,8 +16,12 @@
476 *
477 *********************************************************/
478
479 -#include <linux/autoconf.h>
480 #include <linux/version.h>
481 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
482 +#include <linux/autoconf.h>
483 +#else
484 +#include <generated/autoconf.h>
485 +#endif
486
487 /*
488 * All kernels before 2.6.22 take 6 arguments. All kernels since
489 --- vsock-only/autoconf/epoll.c 2009-03-27 06:34:32.000000000 +0100
490 +++ vsock-only/autoconf/epoll.c.new 2010-02-05 23:46:39.884406108 +0100
491 @@ -22,8 +22,12 @@
492 * never had it, but some distros backported epoll patch.
493 */
494
495 -#include <linux/autoconf.h>
496 #include <linux/version.h>
497 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
498 +#include <linux/autoconf.h>
499 +#else
500 +#include <generated/autoconf.h>
501 +#endif
502
503 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
504 #include <linux/poll.h>
505 --- vsock-only/autoconf/filldir1.c 2009-03-27 06:34:32.000000000 +0100
506 +++ vsock-only/autoconf/filldir1.c.new 2010-02-05 23:46:52.692243523 +0100
507 @@ -16,8 +16,12 @@
508 *
509 *********************************************************/
510
511 -#include <linux/autoconf.h>
512 #include <linux/version.h>
513 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
514 +#include <linux/autoconf.h>
515 +#else
516 +#include <generated/autoconf.h>
517 +#endif
518
519 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20)
520 #include <linux/fs.h>
521 --- vsock-only/autoconf/geninclude.c 2009-03-27 06:34:32.000000000 +0100
522 +++ vsock-only/autoconf/geninclude.c.new 2010-02-05 23:46:58.292953391 +0100
523 @@ -16,7 +16,12 @@
524 *
525 *********************************************************/
526
527 +#include <linux/version.h>
528 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
529 #include <linux/autoconf.h>
530 +#else
531 +#include <generated/autoconf.h>
532 +#endif
533
534 #ifdef CONFIG_X86_VOYAGER
535 APATH/mach-voyager
536 --- vsock-only/autoconf/getsb1.c 2009-03-27 06:34:32.000000000 +0100
537 +++ vsock-only/autoconf/getsb1.c.new 2010-02-05 23:47:07.516892747 +0100
538 @@ -16,8 +16,12 @@
539 *
540 *********************************************************/
541
542 -#include <linux/autoconf.h>
543 #include <linux/version.h>
544 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
545 +#include <linux/autoconf.h>
546 +#else
547 +#include <generated/autoconf.h>
548 +#endif
549
550 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19)
551
552 --- vsock-only/autoconf/setnice.c 2009-03-27 06:34:32.000000000 +0100
553 +++ vsock-only/autoconf/setnice.c.new 2010-02-05 23:47:16.829514462 +0100
554 @@ -20,8 +20,12 @@
555 * set_user_nice appeared in 2.4.21. But some distros
556 * backported it to older kernels.
557 */
558 -#include <linux/autoconf.h>
559 #include <linux/version.h>
560 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
561 +#include <linux/autoconf.h>
562 +#else
563 +#include <generated/autoconf.h>
564 +#endif
565
566 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 21)
567 #include <linux/sched.h>
568 --- vsock-only/autoconf/sk_filter.c 2009-03-27 06:34:32.000000000 +0100
569 +++ vsock-only/autoconf/sk_filter.c.new 2010-02-05 23:47:28.501825992 +0100
570 @@ -23,8 +23,12 @@
571 * This test will fail to build on kernels with the new interface.
572 */
573
574 -#include <linux/autoconf.h>
575 #include <linux/version.h>
576 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
577 +#include <linux/autoconf.h>
578 +#else
579 +#include <generated/autoconf.h>
580 +#endif
581
582 /*
583 * We'd restrict this test to 2.4.21 and earlier kernels, but Mandrake's
584 --- vsock-only/autoconf/statfs1.c 2009-03-27 06:34:32.000000000 +0100
585 +++ vsock-only/autoconf/statfs1.c.new 2010-02-05 23:47:41.174472911 +0100
586 @@ -16,8 +16,12 @@
587 *
588 *********************************************************/
589
590 -#include <linux/autoconf.h>
591 #include <linux/version.h>
592 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
593 +#include <linux/autoconf.h>
594 +#else
595 +#include <generated/autoconf.h>
596 +#endif
597
598 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19)
599 #include <linux/fs.h>
600 --- vsock-only/include/driver-config.h.old 2010-02-03 00:12:31.439000354 +0100
601 +++ vsock-only/include/driver-config.h 2010-02-03 00:13:29.608823892 +0100
602 @@ -32,7 +32,12 @@
603 #define INCLUDE_ALLOW_VMNIXMOD
604 #include "includeCheck.h"
605
606 +#include <linux/version.h>
607 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
608 #include <linux/autoconf.h>
609 +#else
610 +#include <generated/autoconf.h>
611 +#endif
612 #include "compat_version.h"
613
614 /*
615
616
617
618 1.1 app-emulation/vmware-modules/files/1.0.0.25-autoconf-generated.patch
619
620 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-modules/files/1.0.0.25-autoconf-generated.patch?rev=1.1&view=markup
621 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-modules/files/1.0.0.25-autoconf-generated.patch?rev=1.1&content-type=text/plain
622
623 Index: 1.0.0.25-autoconf-generated.patch
624 ===================================================================
625 --- vmblock-only/autoconf/cachecreate.c 2009-03-27 06:34:29.000000000 +0100
626 +++ vmblock-only/autoconf/cachecreate.c.new 2010-02-05 23:29:47.077574422 +0100
627 @@ -16,8 +16,12 @@
628 *
629 *********************************************************/
630
631 -#include <linux/autoconf.h>
632 #include <linux/version.h>
633 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
634 +#include <linux/autoconf.h>
635 +#else
636 +#include <generated/autoconf.h>
637 +#endif
638
639 /*
640 * All kernels before 2.6.22 take 6 arguments. All kernels since
641 --- vmblock-only/autoconf/cachector.c 2009-03-27 06:34:29.000000000 +0100
642 +++ vmblock-only/autoconf/cachector.c.new 2010-02-05 23:32:39.086240477 +0100
643 @@ -16,8 +16,12 @@
644 *
645 *********************************************************/
646
647 -#include <linux/autoconf.h>
648 #include <linux/version.h>
649 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
650 +#include <linux/autoconf.h>
651 +#else
652 +#include <generated/autoconf.h>
653 +#endif
654
655 /*
656 * Between 2.6.23 and 2.6.24-rc1 ctor prototype was changed from
657 --- vmblock-only/autoconf/cachector1.c 2009-03-27 06:34:29.000000000 +0100
658 +++ vmblock-only/autoconf/cachector1.c.new 2010-02-05 23:33:57.863050887 +0100
659 @@ -16,8 +16,12 @@
660 *
661 *********************************************************/
662
663 -#include <linux/autoconf.h>
664 #include <linux/version.h>
665 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
666 +#include <linux/autoconf.h>
667 +#else
668 +#include <generated/autoconf.h>
669 +#endif
670
671 /*
672 * Between 2.6.27-rc1 and 2.6.27-rc2 ctor prototype was changed from
673 --- vmblock-only/autoconf/epoll.c 2009-03-27 06:34:29.000000000 +0100
674 +++ vmblock-only/autoconf/epoll.c.new 2010-02-05 23:34:03.782195888 +0100
675 @@ -22,8 +22,12 @@
676 * never had it, but some distros backported epoll patch.
677 */
678
679 -#include <linux/autoconf.h>
680 #include <linux/version.h>
681 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
682 +#include <linux/autoconf.h>
683 +#else
684 +#include <generated/autoconf.h>
685 +#endif
686
687 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
688 #include <linux/poll.h>
689 --- vmblock-only/autoconf/filldir1.c 2009-03-27 06:34:29.000000000 +0100
690 +++ vmblock-only/autoconf/filldir1.c.new 2010-02-05 23:34:09.582480900 +0100
691 @@ -16,8 +16,12 @@
692 *
693 *********************************************************/
694
695 -#include <linux/autoconf.h>
696 #include <linux/version.h>
697 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
698 +#include <linux/autoconf.h>
699 +#else
700 +#include <generated/autoconf.h>
701 +#endif
702
703 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20)
704 #include <linux/fs.h>
705 --- vmblock-only/autoconf/geninclude.c 2009-03-27 06:34:29.000000000 +0100
706 +++ vmblock-only/autoconf/geninclude.c.new 2010-02-05 23:34:16.775702411 +0100
707 @@ -16,7 +16,12 @@
708 *
709 *********************************************************/
710
711 +#include <linux/version.h>
712 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
713 #include <linux/autoconf.h>
714 +#else
715 +#include <generated/autoconf.h>
716 +#endif
717
718 #ifdef CONFIG_X86_VOYAGER
719 APATH/mach-voyager
720 --- vmblock-only/autoconf/getsb1.c 2009-03-27 06:34:29.000000000 +0100
721 +++ vmblock-only/autoconf/getsb1.c.new 2010-02-05 23:34:21.727106345 +0100
722 @@ -16,8 +16,12 @@
723 *
724 *********************************************************/
725
726 -#include <linux/autoconf.h>
727 #include <linux/version.h>
728 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
729 +#include <linux/autoconf.h>
730 +#else
731 +#include <generated/autoconf.h>
732 +#endif
733
734 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19)
735
736 --- vmblock-only/autoconf/setnice.c 2009-03-27 06:34:29.000000000 +0100
737 +++ vmblock-only/autoconf/setnice.c.new 2010-02-05 23:34:27.326719885 +0100
738 @@ -20,8 +20,12 @@
739 * set_user_nice appeared in 2.4.21. But some distros
740 * backported it to older kernels.
741 */
742 -#include <linux/autoconf.h>
743 #include <linux/version.h>
744 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
745 +#include <linux/autoconf.h>
746 +#else
747 +#include <generated/autoconf.h>
748 +#endif
749
750 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 21)
751 #include <linux/sched.h>
752 --- vmblock-only/autoconf/statfs1.c 2009-03-27 06:34:29.000000000 +0100
753 +++ vmblock-only/autoconf/statfs1.c.new 2010-02-05 23:34:34.998496715 +0100
754 @@ -16,8 +16,12 @@
755 *
756 *********************************************************/
757
758 -#include <linux/autoconf.h>
759 #include <linux/version.h>
760 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
761 +#include <linux/autoconf.h>
762 +#else
763 +#include <generated/autoconf.h>
764 +#endif
765
766 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19)
767 #include <linux/fs.h>
768 --- vmblock-only/include/driver-config.h.old 2010-02-03 00:12:31.439000354 +0100
769 +++ vmblock-only/include/driver-config.h 2010-02-03 00:13:29.608823892 +0100
770 @@ -32,7 +32,12 @@
771 #define INCLUDE_ALLOW_VMNIXMOD
772 #include "includeCheck.h"
773
774 +#include <linux/version.h>
775 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
776 #include <linux/autoconf.h>
777 +#else
778 +#include <generated/autoconf.h>
779 +#endif
780 #include "compat_version.h"
781
782 /*
783 --- vmci-only/autoconf/epoll.c 2009-03-27 06:34:31.000000000 +0100
784 +++ vmci-only/autoconf/epoll.c.new 2010-02-05 23:38:31.793973380 +0100
785 @@ -22,8 +22,12 @@
786 * never had it, but some distros backported epoll patch.
787 */
788
789 -#include <linux/autoconf.h>
790 #include <linux/version.h>
791 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
792 +#include <linux/autoconf.h>
793 +#else
794 +#include <generated/autoconf.h>
795 +#endif
796
797 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
798 #include <linux/poll.h>
799 --- vmci-only/autoconf/geninclude.c 2009-03-27 06:34:31.000000000 +0100
800 +++ vmci-only/autoconf/geninclude.c.new 2010-02-05 23:38:45.704327021 +0100
801 @@ -16,7 +16,12 @@
802 *
803 *********************************************************/
804
805 +#include <linux/version.h>
806 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
807 #include <linux/autoconf.h>
808 +#else
809 +#include <generated/autoconf.h>
810 +#endif
811
812 #ifdef CONFIG_X86_VOYAGER
813 APATH/mach-voyager
814 --- vmci-only/include/driver-config.h.old 2010-02-03 00:12:31.439000354 +0100
815 +++ vmci-only/include/driver-config.h 2010-02-03 00:13:29.608823892 +0100
816 @@ -32,7 +32,12 @@
817 #define INCLUDE_ALLOW_VMNIXMOD
818 #include "includeCheck.h"
819
820 +#include <linux/version.h>
821 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
822 #include <linux/autoconf.h>
823 +#else
824 +#include <generated/autoconf.h>
825 +#endif
826 #include "compat_version.h"
827
828 /*
829 --- vmmon-only/autoconf/epoll.c 2010-02-05 23:39:45.361576611 +0100
830 +++ vmmon-only/autoconf/epoll.c.new 2010-02-05 23:40:41.241245910 +0100
831 @@ -22,8 +22,12 @@
832 * never had it, but some distros backported epoll patch.
833 */
834
835 -#include <linux/autoconf.h>
836 #include <linux/version.h>
837 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
838 +#include <linux/autoconf.h>
839 +#else
840 +#include <generated/autoconf.h>
841 +#endif
842
843 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
844 #include <linux/poll.h>
845 --- vmmon-only/autoconf/geninclude.c 2010-02-05 23:39:45.362577852 +0100
846 +++ vmmon-only/autoconf/geninclude.c.new 2010-02-05 23:40:50.833402279 +0100
847 @@ -16,7 +16,12 @@
848 *
849 *********************************************************/
850
851 +#include <linux/version.h>
852 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
853 #include <linux/autoconf.h>
854 +#else
855 +#include <generated/autoconf.h>
856 +#endif
857
858 #ifdef CONFIG_X86_VOYAGER
859 APATH/mach-voyager
860 --- vmmon-only/autoconf/nopage1.c 2010-02-05 23:39:45.363577625 +0100
861 +++ vmmon-only/autoconf/nopage1.c.new 2010-02-05 23:40:58.674161808 +0100
862 @@ -21,8 +21,12 @@
863 * it uses new prototype. For 2.6.1 (and its -rc) and older do
864 * compile test.
865 */
866 -#include <linux/autoconf.h>
867 #include <linux/version.h>
868 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
869 +#include <linux/autoconf.h>
870 +#else
871 +#include <generated/autoconf.h>
872 +#endif
873
874 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 2)
875 #include <linux/mm.h>
876 --- vmmon-only/autoconf/setnice.c 2010-02-05 23:39:45.363577625 +0100
877 +++ vmmon-only/autoconf/setnice.c.new 2010-02-05 23:41:12.017985901 +0100
878 @@ -20,8 +20,12 @@
879 * set_user_nice appeared in 2.4.21. But some distros
880 * backported it to older kernels.
881 */
882 -#include <linux/autoconf.h>
883 #include <linux/version.h>
884 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
885 +#include <linux/autoconf.h>
886 +#else
887 +#include <generated/autoconf.h>
888 +#endif
889
890 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 21)
891 #include <linux/sched.h>
892 --- vmmon-only/autoconf/smpcall.c 2010-02-05 23:39:45.364577754 +0100
893 +++ vmmon-only/autoconf/smpcall.c.new 2010-02-05 23:40:25.057954672 +0100
894 @@ -21,8 +21,12 @@
895 * Change happened between 2.6.26 and 2.6.27-rc1.
896 */
897
898 -#include <linux/autoconf.h>
899 #include <linux/version.h>
900 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
901 +#include <linux/autoconf.h>
902 +#else
903 +#include <generated/autoconf.h>
904 +#endif
905
906 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26)
907 # error This compile test intentionally fails.
908 --- vmmon-only/include/driver-config.h.old 2010-02-03 00:12:31.439000354 +0100
909 +++ vmmon-only/include/driver-config.h 2010-02-03 00:13:29.608823892 +0100
910 @@ -32,7 +32,12 @@
911 #define INCLUDE_ALLOW_VMNIXMOD
912 #include "includeCheck.h"
913
914 +#include <linux/version.h>
915 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
916 #include <linux/autoconf.h>
917 +#else
918 +#include <generated/autoconf.h>
919 +#endif
920 #include "compat_version.h"
921
922 /*
923 --- vmnet-only/epoll.c 2009-03-27 06:34:28.000000000 +0100
924 +++ vmnet-only/epoll.c.new 2010-02-05 23:43:43.642940246 +0100
925 @@ -22,8 +22,12 @@
926 * never had it, but some distros backported epoll patch.
927 */
928
929 -#include <linux/autoconf.h>
930 #include <linux/version.h>
931 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
932 +#include <linux/autoconf.h>
933 +#else
934 +#include <generated/autoconf.h>
935 +#endif
936
937 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
938 #include <linux/poll.h>
939 --- vmnet-only/geninclude.c 2009-03-27 06:34:28.000000000 +0100
940 +++ vmnet-only/geninclude.c.new 2010-02-05 23:43:52.931081128 +0100
941 @@ -16,7 +16,12 @@
942 *
943 *********************************************************/
944
945 +#include <linux/version.h>
946 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
947 #include <linux/autoconf.h>
948 +#else
949 +#include <generated/autoconf.h>
950 +#endif
951
952 #ifdef CONFIG_X86_VOYAGER
953 APATH/mach-voyager
954 --- vmnet-only/netdev_has_dev_net.c 2009-03-27 06:34:28.000000000 +0100
955 +++ vmnet-only/netdev_has_dev_net.c.new 2010-02-05 23:44:11.315557541 +0100
956 @@ -21,8 +21,12 @@
957 * It appeared between 2.6.25 and 2.6.26-rc1.
958 */
959
960 -#include <linux/autoconf.h>
961 #include <linux/version.h>
962 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
963 +#include <linux/autoconf.h>
964 +#else
965 +#include <generated/autoconf.h>
966 +#endif
967
968 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25)
969 # error This compile test intentionally fails.
970 --- vmnet-only/netdev_has_net.c 2009-03-27 06:34:28.000000000 +0100
971 +++ vmnet-only/netdev_has_net.c.new 2010-02-05 23:44:29.348948588 +0100
972 @@ -27,8 +27,12 @@
973 * as hopefully in few weeks all 2.6.24-rc1 users will be gone.
974 */
975
976 -#include <linux/autoconf.h>
977 #include <linux/version.h>
978 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
979 +#include <linux/autoconf.h>
980 +#else
981 +#include <generated/autoconf.h>
982 +#endif
983
984 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 23)
985 # error This compile test intentionally fails.
986 --- vmnet-only/nfhook_uses_skb.c 2009-03-27 06:34:28.000000000 +0100
987 +++ vmnet-only/nfhook_uses_skb.c.new 2010-02-05 23:44:35.228702615 +0100
988 @@ -23,8 +23,12 @@
989 * 2.6.24-rc1.
990 */
991
992 -#include <linux/autoconf.h>
993 #include <linux/version.h>
994 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
995 +#include <linux/autoconf.h>
996 +#else
997 +#include <generated/autoconf.h>
998 +#endif
999
1000 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 23)
1001 # error This compile test intentionally fails.
1002 --- vmnet-only/setnice.c 2009-03-27 06:34:28.000000000 +0100
1003 +++ vmnet-only/setnice.c.new 2010-02-05 23:44:45.613286546 +0100
1004 @@ -20,8 +20,12 @@
1005 * set_user_nice appeared in 2.4.21. But some distros
1006 * backported it to older kernels.
1007 */
1008 -#include <linux/autoconf.h>
1009 #include <linux/version.h>
1010 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
1011 +#include <linux/autoconf.h>
1012 +#else
1013 +#include <generated/autoconf.h>
1014 +#endif
1015
1016 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 21)
1017 #include <linux/sched.h>
1018 --- vmnet-only/sk_alloc.c 2009-03-27 06:34:28.000000000 +0100
1019 +++ vmnet-only/sk_alloc.c.new 2010-02-05 23:44:59.796490045 +0100
1020 @@ -21,8 +21,12 @@
1021 * This API change was introduced between 2.6.12-rc1 and 2.6.12-rc2.
1022 */
1023
1024 -#include <linux/autoconf.h>
1025 #include <linux/version.h>
1026 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
1027 +#include <linux/autoconf.h>
1028 +#else
1029 +#include <generated/autoconf.h>
1030 +#endif
1031
1032 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 13)
1033 #include <net/sock.h>
1034 --- vmnet-only/skblin.c 2009-03-27 06:34:28.000000000 +0100
1035 +++ vmnet-only/skblin.c.new 2010-02-05 23:45:17.276123591 +0100
1036 @@ -20,8 +20,12 @@
1037 * Detect whether skb_linearize takes one or two arguments.
1038 */
1039
1040 -#include <linux/autoconf.h>
1041 #include <linux/version.h>
1042 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
1043 +#include <linux/autoconf.h>
1044 +#else
1045 +#include <generated/autoconf.h>
1046 +#endif
1047
1048 #if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 17)
1049 /*
1050 --- vmnet-only/driver-config.h.old 2010-02-03 00:12:31.439000354 +0100
1051 +++ vmnet-only/driver-config.h 2010-02-03 00:13:29.608823892 +0100
1052 @@ -32,7 +32,12 @@
1053 #define INCLUDE_ALLOW_VMNIXMOD
1054 #include "includeCheck.h"
1055
1056 +#include <linux/version.h>
1057 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
1058 #include <linux/autoconf.h>
1059 +#else
1060 +#include <generated/autoconf.h>
1061 +#endif
1062 #include "compat_version.h"
1063
1064 /*
1065 --- vsock-only/autoconf/cachecreate.c 2009-03-27 06:34:32.000000000 +0100
1066 +++ vsock-only/autoconf/cachecreate.c.new 2010-02-05 23:46:29.157369452 +0100
1067 @@ -16,8 +16,12 @@
1068 *
1069 *********************************************************/
1070
1071 -#include <linux/autoconf.h>
1072 #include <linux/version.h>
1073 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
1074 +#include <linux/autoconf.h>
1075 +#else
1076 +#include <generated/autoconf.h>
1077 +#endif
1078
1079 /*
1080 * All kernels before 2.6.22 take 6 arguments. All kernels since
1081 --- vsock-only/autoconf/epoll.c 2009-03-27 06:34:32.000000000 +0100
1082 +++ vsock-only/autoconf/epoll.c.new 2010-02-05 23:46:39.884406108 +0100
1083 @@ -22,8 +22,12 @@
1084 * never had it, but some distros backported epoll patch.
1085 */
1086
1087 -#include <linux/autoconf.h>
1088 #include <linux/version.h>
1089 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
1090 +#include <linux/autoconf.h>
1091 +#else
1092 +#include <generated/autoconf.h>
1093 +#endif
1094
1095 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
1096 #include <linux/poll.h>
1097 --- vsock-only/autoconf/filldir1.c 2009-03-27 06:34:32.000000000 +0100
1098 +++ vsock-only/autoconf/filldir1.c.new 2010-02-05 23:46:52.692243523 +0100
1099 @@ -16,8 +16,12 @@
1100 *
1101 *********************************************************/
1102
1103 -#include <linux/autoconf.h>
1104 #include <linux/version.h>
1105 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
1106 +#include <linux/autoconf.h>
1107 +#else
1108 +#include <generated/autoconf.h>
1109 +#endif
1110
1111 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20)
1112 #include <linux/fs.h>
1113 --- vsock-only/autoconf/geninclude.c 2009-03-27 06:34:32.000000000 +0100
1114 +++ vsock-only/autoconf/geninclude.c.new 2010-02-05 23:46:58.292953391 +0100
1115 @@ -16,7 +16,12 @@
1116 *
1117 *********************************************************/
1118
1119 +#include <linux/version.h>
1120 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
1121 #include <linux/autoconf.h>
1122 +#else
1123 +#include <generated/autoconf.h>
1124 +#endif
1125
1126 #ifdef CONFIG_X86_VOYAGER
1127 APATH/mach-voyager
1128 --- vsock-only/autoconf/getsb1.c 2009-03-27 06:34:32.000000000 +0100
1129 +++ vsock-only/autoconf/getsb1.c.new 2010-02-05 23:47:07.516892747 +0100
1130 @@ -16,8 +16,12 @@
1131 *
1132 *********************************************************/
1133
1134 -#include <linux/autoconf.h>
1135 #include <linux/version.h>
1136 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
1137 +#include <linux/autoconf.h>
1138 +#else
1139 +#include <generated/autoconf.h>
1140 +#endif
1141
1142 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19)
1143
1144 --- vsock-only/autoconf/setnice.c 2009-03-27 06:34:32.000000000 +0100
1145 +++ vsock-only/autoconf/setnice.c.new 2010-02-05 23:47:16.829514462 +0100
1146 @@ -20,8 +20,12 @@
1147 * set_user_nice appeared in 2.4.21. But some distros
1148 * backported it to older kernels.
1149 */
1150 -#include <linux/autoconf.h>
1151 #include <linux/version.h>
1152 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
1153 +#include <linux/autoconf.h>
1154 +#else
1155 +#include <generated/autoconf.h>
1156 +#endif
1157
1158 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 21)
1159 #include <linux/sched.h>
1160 --- vsock-only/autoconf/sk_filter.c 2009-03-27 06:34:32.000000000 +0100
1161 +++ vsock-only/autoconf/sk_filter.c.new 2010-02-05 23:47:28.501825992 +0100
1162 @@ -23,8 +23,12 @@
1163 * This test will fail to build on kernels with the new interface.
1164 */
1165
1166 -#include <linux/autoconf.h>
1167 #include <linux/version.h>
1168 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
1169 +#include <linux/autoconf.h>
1170 +#else
1171 +#include <generated/autoconf.h>
1172 +#endif
1173
1174 /*
1175 * We'd restrict this test to 2.4.21 and earlier kernels, but Mandrake's
1176 --- vsock-only/autoconf/statfs1.c 2009-03-27 06:34:32.000000000 +0100
1177 +++ vsock-only/autoconf/statfs1.c.new 2010-02-05 23:47:41.174472911 +0100
1178 @@ -16,8 +16,12 @@
1179 *
1180 *********************************************************/
1181
1182 -#include <linux/autoconf.h>
1183 #include <linux/version.h>
1184 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
1185 +#include <linux/autoconf.h>
1186 +#else
1187 +#include <generated/autoconf.h>
1188 +#endif
1189
1190 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19)
1191 #include <linux/fs.h>
1192 --- vsock-only/include/driver-config.h.old 2010-02-03 00:12:31.439000354 +0100
1193 +++ vsock-only/include/driver-config.h 2010-02-03 00:13:29.608823892 +0100
1194 @@ -32,7 +32,12 @@
1195 #define INCLUDE_ALLOW_VMNIXMOD
1196 #include "includeCheck.h"
1197
1198 +#include <linux/version.h>
1199 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
1200 #include <linux/autoconf.h>
1201 +#else
1202 +#include <generated/autoconf.h>
1203 +#endif
1204 #include "compat_version.h"
1205
1206 /*
Report Message
Find on MARC Find on Google Groups