| 1 |
ikelos 09/01/13 00:21:34 |
| 2 |
|
| 3 |
Modified: 030_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/vmnet/030_all_kernel-2.6.27.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-modules/files/patches/vmnet/030_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/vmnet/030_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/vmnet/030_all_kernel-2.6.27.patch?r1=1.1&r2=1.2 |
| 14 |
|
| 15 |
Index: 030_all_kernel-2.6.27.patch |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/files/patches/vmnet/030_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 |
--- 030_all_kernel-2.6.27.patch 10 Jan 2009 12:10:56 -0000 1.1 |
| 22 |
+++ 030_all_kernel-2.6.27.patch 13 Jan 2009 00:21:34 -0000 1.2 |
| 23 |
@@ -1,7 +1,8 @@ |
| 24 |
-diff -pur vmnet-only.orig/bridge.c vmnet-only/bridge.c |
| 25 |
---- vmnet-only.orig/bridge.c 2008-05-10 06:25:56.000000000 +0200 |
| 26 |
-+++ vmnet-only/bridge.c 2008-10-16 18:36:57.000000000 +0200 |
| 27 |
-@@ -274,7 +274,7 @@ VNetBridgeDevCompatible(VNetBridge *brid |
| 28 |
+diff --git a/bridge.c b/bridge.c |
| 29 |
+index cdf9e0b..700c1a2 100644 |
| 30 |
+--- a/bridge.c |
| 31 |
++++ b/bridge.c |
| 32 |
+@@ -275,7 +275,7 @@ VNetBridgeDevCompatible(VNetBridge *bridge, // IN: Bridge |
| 33 |
struct net_device *net) // IN: Network device |
| 34 |
{ |
| 35 |
#ifdef VMW_NETDEV_HAS_NET |
| 36 |
@@ -10,21 +11,26 @@ |
| 37 |
return 0; |
| 38 |
} |
| 39 |
#endif |
| 40 |
-diff -pur vmnet-only.orig/compat_semaphore.h vmnet-only/compat_semaphore.h |
| 41 |
---- vmnet-only.orig/compat_semaphore.h 2008-05-10 06:25:56.000000000 +0200 |
| 42 |
-+++ vmnet-only/compat_semaphore.h 2008-10-16 18:37:21.000000000 +0200 |
| 43 |
-@@ -2,7 +2,7 @@ |
| 44 |
+diff --git a/compat_semaphore.h b/compat_semaphore.h |
| 45 |
+index a3a88c2..c3038d7 100644 |
| 46 |
+--- a/compat_semaphore.h |
| 47 |
++++ b/compat_semaphore.h |
| 48 |
+@@ -6,7 +6,11 @@ |
| 49 |
# define __COMPAT_SEMAPHORE_H__ |
| 50 |
|
| 51 |
|
| 52 |
--#include <asm/semaphore.h> |
| 53 |
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27) |
| 54 |
+#include <linux/semaphore.h> |
| 55 |
++#else |
| 56 |
+ #include <asm/semaphore.h> |
| 57 |
++#endif |
| 58 |
|
| 59 |
|
| 60 |
/* |
| 61 |
-diff -pur vmnet-only.orig/procfs.c vmnet-only/procfs.c |
| 62 |
---- vmnet-only.orig/procfs.c 2008-05-10 06:25:56.000000000 +0200 |
| 63 |
-+++ vmnet-only/procfs.c 2008-10-16 18:36:57.000000000 +0200 |
| 64 |
+diff --git a/procfs.c b/procfs.c |
| 65 |
+index 07e894d..73d31e8 100644 |
| 66 |
+--- a/procfs.c |
| 67 |
++++ b/procfs.c |
| 68 |
@@ -63,7 +63,7 @@ VNetProc_Init(void) |
| 69 |
{ |
| 70 |
int retval; |
| 71 |
@@ -43,9 +49,10 @@ |
| 72 |
base = NULL; |
| 73 |
} |
| 74 |
|
| 75 |
-diff -pur vmnet-only.orig/vmnetInt.h vmnet-only/vmnetInt.h |
| 76 |
---- vmnet-only.orig/vmnetInt.h 2008-05-10 06:25:56.000000000 +0200 |
| 77 |
-+++ vmnet-only/vmnetInt.h 2008-10-16 18:36:57.000000000 +0200 |
| 78 |
+diff --git a/vmnetInt.h b/vmnetInt.h |
| 79 |
+index 483c457..551be73 100644 |
| 80 |
+--- a/vmnetInt.h |
| 81 |
++++ b/vmnetInt.h |
| 82 |
@@ -63,7 +63,7 @@ |
| 83 |
# define dev_lock_list() read_lock(&dev_base_lock) |
| 84 |
# define dev_unlock_list() read_unlock(&dev_base_lock) |
| 85 |
@@ -55,7 +62,7 @@ |
| 86 |
# else |
| 87 |
# define DEV_GET(x) __dev_get_by_name((x)->name) |
| 88 |
# endif |
| 89 |
-@@ -89,7 +89,7 @@ |
| 90 |
+@@ -87,7 +87,7 @@ |
| 91 |
|
| 92 |
#ifdef VMW_NETDEV_HAS_NET |
| 93 |
extern struct proto vmnet_proto; |
Archives