From: | "Mike Auty (ikelos)" <ikelos@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in app-emulation/vmware-modules/files/patches/vmmon: 040_all_kernel-2.6.27.patch |
Date: | Tue, 13 Jan 2009 00:21:38 |
Message-Id: | E1LMX2E-0007IM-5i@stork.gentoo.org |
1 | ikelos 09/01/13 00:21:34 |
2 | |
3 | Modified: 040_all_kernel-2.6.27.patch |
4 | Log: |
5 | Actually add the patch changes this time... |
6 | (Portage version: 2.2_rc20/cvs/Linux 2.6.28 i686) |
7 | |
8 | Revision Changes Path |
9 | 1.2 app-emulation/vmware-modules/files/patches/vmmon/040_all_kernel-2.6.27.patch |
10 | |
11 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-modules/files/patches/vmmon/040_all_kernel-2.6.27.patch?rev=1.2&view=markup |
12 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-modules/files/patches/vmmon/040_all_kernel-2.6.27.patch?rev=1.2&content-type=text/plain |
13 | diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-modules/files/patches/vmmon/040_all_kernel-2.6.27.patch?r1=1.1&r2=1.2 |
14 | |
15 | Index: 040_all_kernel-2.6.27.patch |
16 | =================================================================== |
17 | RCS file: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/files/patches/vmmon/040_all_kernel-2.6.27.patch,v |
18 | retrieving revision 1.1 |
19 | retrieving revision 1.2 |
20 | diff -u -r1.1 -r1.2 |
21 | --- 040_all_kernel-2.6.27.patch 10 Jan 2009 12:10:55 -0000 1.1 |
22 | +++ 040_all_kernel-2.6.27.patch 13 Jan 2009 00:21:34 -0000 1.2 |
23 | @@ -22,15 +22,18 @@ |
24 | return FALSE; |
25 | } |
26 | diff --git a/include/compat_semaphore.h b/include/compat_semaphore.h |
27 | -index 6514067..b2e399d 100644 |
28 | +index 6514067..d0da703 100644 |
29 | --- a/include/compat_semaphore.h |
30 | +++ b/include/compat_semaphore.h |
31 | -@@ -2,7 +2,7 @@ |
32 | +@@ -2,7 +2,11 @@ |
33 | # define __COMPAT_SEMAPHORE_H__ |
34 | |
35 | |
36 | --#include <asm/semaphore.h> |
37 | ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27) |
38 | +#include <linux/semaphore.h> |
39 | ++#else |
40 | + #include <asm/semaphore.h> |
41 | ++#endif |
42 | |
43 | |
44 | /* |