summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Kitsinger (SwooshyCueb)2016-05-26 00:28:42 -0500
committerMarkus Kitsinger (SwooshyCueb)2016-05-26 00:28:42 -0500
commit14dbae2dbf9d74a9f0c070f8ceff8883f5c49e4c (patch)
tree90e52a769c47ebf92643abd1105577cf1b04ca81
parentf42754a53adfaf703cad290f791a44a073834ca1 (diff)
downloadaur-14dbae2dbf9d74a9f0c070f8ceff8883f5c49e4c.tar.gz
Small tweak to vmmon patch
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD4
-rw-r--r--vmmon.patch11
3 files changed, 7 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 62f07c533386..7aaaa9e964e4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = vmware-modules-dkms
pkgdesc = VMware Workstation kernel modules (DKMS)
pkgver = 308.0
- pkgrel = 4
+ pkgrel = 5
url = http://www.vmware.com/
install = vmware-modules-dkms.install
arch = i686
@@ -25,7 +25,7 @@ pkgbase = vmware-modules-dkms
sha256sums = 707596776b0b232f7f5de4a0ddff12262df3bc934180afd956ea2ee45ac4db9e
sha256sums = 48951fcb72e1f964e21dc3f7ea4729dd673936abdd28b54008dbca9b0967683f
sha256sums = 3f6bcef6e88718a4d2b5aba8a10856ad0857006755c2ccaa5de8fc596441770c
- sha256sums = 06fc4a6d3c89b147089bca1f6df3b4fc58e819e4a089b76acf0f2463ee0fa215
+ sha256sums = 9a1973abf269d7c9d49b8789e7a2e55595e712e644b2eade849fa19510b0c2f3
sha256sums = fe0018729d8ee9c2a333e9ab2125ea9e228613a743b4a692ad39a06cda7568c2
sha256sums = 324f15cfa838e130a879ab1054a9efd0ef6378854817024f1a1617b57fb55cb9
diff --git a/PKGBUILD b/PKGBUILD
index 7ddbda211a0c..4417d68a1c76 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
pkgname=vmware-modules-dkms
_pkgbase=vmware-modules
pkgver=308.0
-pkgrel=4
+pkgrel=5
pkgdesc="VMware Workstation kernel modules (DKMS)"
arch=('i686' 'x86_64')
url="http://www.vmware.com/"
@@ -35,7 +35,7 @@ sha256sums=('ee3e5cfac51703ac392bce540e3375680c579eaac7aa31990e1e08ada589e89b'
'707596776b0b232f7f5de4a0ddff12262df3bc934180afd956ea2ee45ac4db9e'
'48951fcb72e1f964e21dc3f7ea4729dd673936abdd28b54008dbca9b0967683f'
'3f6bcef6e88718a4d2b5aba8a10856ad0857006755c2ccaa5de8fc596441770c'
- '06fc4a6d3c89b147089bca1f6df3b4fc58e819e4a089b76acf0f2463ee0fa215'
+ '9a1973abf269d7c9d49b8789e7a2e55595e712e644b2eade849fa19510b0c2f3'
'fe0018729d8ee9c2a333e9ab2125ea9e228613a743b4a692ad39a06cda7568c2'
'324f15cfa838e130a879ab1054a9efd0ef6378854817024f1a1617b57fb55cb9')
diff --git a/vmmon.patch b/vmmon.patch
index b421640e10c3..b0aeddea1e13 100644
--- a/vmmon.patch
+++ b/vmmon.patch
@@ -1,18 +1,13 @@
- vmmon/linux/{ => }/driver.c | 2 +-
- vmmon/linux/{ => }/hostif.c | 1 +
- vmmon/linux/{ => }/vmmonInt.h | 2 +-
- 3 files changed, 3 insertions(+), 2 deletions(-)
-
diff --git a/vmmon/linux/driver.c b/vmmon/linux/driver.c
-index 31de1dc..ed459fd 100644
+index 0a72335..63cea5d 100644
--- a/vmmon/linux/driver.c
+++ b/vmmon/linux/driver.c
-@@ -1281,7 +1281,7 @@ LinuxDriverReadTSC(void *data, // OUT: TSC values
+@@ -1279,7 +1279,7 @@ LinuxDriverReadTSC(void *data, // OUT: TSC values
*-----------------------------------------------------------------------------
*/
-__attribute__((always_inline)) static Bool
-+inline static Bool
++inline __attribute__((always_inline)) static Bool
LinuxDriverSyncReadTSCs(uint64 *delta) // OUT: TSC max - TSC min
{
TSCDelta tscDelta;