Gentoo Archives: gentoo-commits

From: Fabio Rossi <rossi.f@××××××.net>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/files/
Date: Sun, 25 Jun 2017 21:43:26
Message-Id: 1498426968.d3812eca3c9455951be5632544f70f3fff9205c3.fabio@gentoo
1 commit: d3812eca3c9455951be5632544f70f3fff9205c3
2 Author: Fabio Rossi <rossi.f <AT> inwind <DOT> it>
3 AuthorDate: Sun Jun 25 21:42:48 2017 +0000
4 Commit: Fabio Rossi <rossi.f <AT> inwind <DOT> net>
5 CommitDate: Sun Jun 25 21:42:48 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/vmware.git/commit/?id=d3812eca
7
8 app-emulation/vmware-modules: removed unused patches in FILESDIR
9
10 .../files/308-4.03-00-vmmon-misc_deregister.patch | 14 ----------
11 .../files/308-4.07-00-trans_start.patch | 11 --------
12 .../vmware-modules/files/308-4.11-02-vmmon.patch | 30 ----------------------
13 3 files changed, 55 deletions(-)
14
15 diff --git a/app-emulation/vmware-modules/files/308-4.03-00-vmmon-misc_deregister.patch b/app-emulation/vmware-modules/files/308-4.03-00-vmmon-misc_deregister.patch
16 deleted file mode 100644
17 index 9f0df66..0000000
18 --- a/app-emulation/vmware-modules/files/308-4.03-00-vmmon-misc_deregister.patch
19 +++ /dev/null
20 @@ -1,14 +0,0 @@
21 -diff -ru work.old/vmmon-only/linux/driver.c work/vmmon-only/linux/driver.c
22 ---- work.old/vmmon-only/linux/driver.c 2015-08-14 22:39:49.000000000 +0200
23 -+++ work/vmmon-only/linux/driver.c 2015-09-14 22:11:06.807909249 +0200
24 -@@ -387,9 +387,7 @@
25 - #ifdef VMX86_DEVEL
26 - unregister_chrdev(linuxState.major, linuxState.deviceName);
27 - #else
28 -- if (misc_deregister(&linuxState.misc)) {
29 -- Warning("Module %s: error unregistering\n", linuxState.deviceName);
30 -- }
31 -+ misc_deregister(&linuxState.misc);
32 - #endif
33 -
34 - Log("Module %s: unloaded\n", linuxState.deviceName);
35
36 diff --git a/app-emulation/vmware-modules/files/308-4.07-00-trans_start.patch b/app-emulation/vmware-modules/files/308-4.07-00-trans_start.patch
37 deleted file mode 100644
38 index 751924f..0000000
39 --- a/app-emulation/vmware-modules/files/308-4.07-00-trans_start.patch
40 +++ /dev/null
41 @@ -1,11 +0,0 @@
42 ---- ./vmnet-only/netif.c.old 2016-05-19 20:13:14.259914206 +0200
43 -+++ ./vmnet-only/netif.c 2016-05-19 20:13:21.250914596 +0200
44 -@@ -465,7 +465,7 @@
45 - VNetSend(&netIf->port.jack, skb);
46 -
47 - netIf->stats.tx_packets++;
48 -- dev->trans_start = jiffies;
49 -+ netif_trans_update(dev);
50 -
51 - return 0;
52 - }
53
54 diff --git a/app-emulation/vmware-modules/files/308-4.11-02-vmmon.patch b/app-emulation/vmware-modules/files/308-4.11-02-vmmon.patch
55 deleted file mode 100644
56 index b126453..0000000
57 --- a/app-emulation/vmware-modules/files/308-4.11-02-vmmon.patch
58 +++ /dev/null
59 @@ -1,30 +0,0 @@
60 -diff -ur old/vmmon-only/linux/driver.c vmmon-only/linux/driver.c
61 ---- old/vmmon-only/linux/driver.c 2016-11-12 09:15:52.000000000 +0200
62 -+++ vmmon-only/linux/driver.c 2017-03-06 10:46:33.347053458 +0200
63 -@@ -105,7 +105,7 @@
64 - static int LinuxDriver_Close(struct inode *inode, struct file *filp);
65 - static unsigned int LinuxDriverPoll(struct file *file, poll_table *wait);
66 - #if defined(VMW_NOPAGE_2624)
67 --static int LinuxDriverFault(struct vm_area_struct *vma, struct vm_fault *fault);
68 -+static int LinuxDriverFault(struct vm_fault *fault);
69 - #else
70 - static struct page *LinuxDriverNoPage(struct vm_area_struct *vma,
71 - unsigned long address,
72 -@@ -882,15 +882,14 @@
73 - */
74 -
75 - #if defined(VMW_NOPAGE_2624)
76 --static int LinuxDriverFault(struct vm_area_struct *vma, //IN
77 -- struct vm_fault *fault) //IN/OUT
78 -+static int LinuxDriverFault(struct vm_fault *fault) //IN/OUT
79 - #else
80 - static struct page *LinuxDriverNoPage(struct vm_area_struct *vma, //IN
81 - unsigned long address, //IN
82 - int *type) //OUT: Fault type
83 - #endif
84 - {
85 -- VMLinux *vmLinux = (VMLinux *) vma->vm_file->private_data;
86 -+ VMLinux *vmLinux = (VMLinux *) fault->vma->vm_file->private_data;
87 - unsigned long pg;
88 - struct page* page;
89 -