Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 312663 Details for
Bug 417059
[PATCH] app-emulation/vmware-modules-264.3 fails to compile against the 3.4 kernel
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
Patch to build vmblock driver on linux kernels above and below 3.4
vmware3.4.0.patch (text/plain), 3.47 KB, created by
Mike Auty (RETIRED)
on 2012-05-22 09:46:42 UTC
(
hide
)
Description:
Patch to build vmblock driver on linux kernels above and below 3.4
Filename:
MIME Type:
Creator:
Mike Auty (RETIRED)
Created:
2012-05-22 09:46:42 UTC
Size:
3.47 KB
patch
obsolete
>diff -u -r source802/vmblock-only/linux/filesystem.c source/vmblock-only/linux/filesystem.c >--- source802/vmblock-only/linux/filesystem.c 2012-01-18 22:01:07.000000000 +0100 >+++ source/vmblock-only/linux/filesystem.c 2012-04-01 11:48:24.000000000 +0200 >@@ -525,7 +525,11 @@ > return -EINVAL; > } > >+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0) > rootDentry = d_alloc_root(rootInode); >+#else >+ rootDentry = d_make_root(rootInode); >+#endif > if (!rootDentry) { > iput(rootInode); > return -ENOMEM; >diff -u -r source802/vmnet-only/filter.c source/vmnet-only/filter.c >--- source802/vmnet-only/filter.c 2012-01-18 23:22:02.000000000 +0100 >+++ source/vmnet-only/filter.c 2012-01-26 18:07:13.000000000 +0100 >@@ -40,6 +40,10 @@ > #include "vnetInt.h" > #include "vmnetInt.h" > >+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0) >+#include <linux/export.h> >+#endif >+ > // VNet_FilterLogPacket.action for dropped packets > #define VNET_FILTER_ACTION_DRP (1) > #define VNET_FILTER_ACTION_DRP_SHORT (2) >diff -u -r source802/vmnet-only/netif.c source/vmnet-only/netif.c >--- source802/vmnet-only/netif.c 2012-01-18 23:22:02.000000000 +0100 >+++ source/vmnet-only/netif.c 2012-01-26 13:41:18.000000000 +0100 >@@ -62,7 +62,9 @@ > static int VNetNetifStartXmit(struct sk_buff *skb, struct net_device *dev); > static struct net_device_stats *VNetNetifGetStats(struct net_device *dev); > static int VNetNetifSetMAC(struct net_device *dev, void *addr); >+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 42, 0) || (LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0) && LINUX_VERSION_CODE >= KERNEL_VERSION(3, 0, 0)) > static void VNetNetifSetMulticast(struct net_device *dev); >+#endif > #if 0 > static void VNetNetifTxTimeout(struct net_device *dev); > #endif >@@ -131,7 +133,9 @@ > .ndo_stop = VNetNetifClose, > .ndo_get_stats = VNetNetifGetStats, > .ndo_set_mac_address = VNetNetifSetMAC, >+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 42, 0) || (LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0) && LINUX_VERSION_CODE >= KERNEL_VERSION(3, 0, 0)) > .ndo_set_multicast_list = VNetNetifSetMulticast, >+#endif > /* > * We cannot stuck... If someone will report problems under > * low memory conditions or some such, we should enable it. >@@ -611,12 +615,12 @@ > * > *---------------------------------------------------------------------- > */ >- >+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 42, 0) || (LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0) && LINUX_VERSION_CODE >= KERNEL_VERSION(3, 0, 0)) > void > VNetNetifSetMulticast(struct net_device *dev) // IN: unused > { > } >- >+#endif > > /* > *---------------------------------------------------------------------- >diff -u -r source802/vmnet-only/userif.c source/vmnet-only/userif.c >--- source802/vmnet-only/userif.c 2012-01-18 23:22:02.000000000 +0100 >+++ source/vmnet-only/userif.c 2012-01-26 13:28:48.000000000 +0100 >@@ -517,10 +517,18 @@ > unsigned int tmpCsum; > const void *vaddr; > >+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 42, 0) && LINUX_VERSION_CODE < KERNEL_VERSION(3, 0, 0)) || LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0) >+ vaddr = kmap(skb_frag_page(frag)); >+#else > vaddr = kmap(frag->page); >+#endif > tmpCsum = csum_and_copy_to_user(vaddr + frag->page_offset, > curr, frag->size, 0, &err); >+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 42, 0) && LINUX_VERSION_CODE < KERNEL_VERSION(3, 0, 0)) || LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0) >+ kunmap(skb_frag_page(frag)); >+#else > kunmap(frag->page); >+#endif > if (err) { > return err; > }
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Raw
Actions:
View
Attachments on
bug 417059
: 312663