[arch-commits] Commit in virtualbox/trunk (010-linux-4-14.patch PKGBUILD)

[Christian Hesse]

    Date: Monday, November 20, 2017 @ 16:05:31
  Author: eworm
Revision: 267603

upgpkg: virtualbox 5.2.0-3

add another fix for linux 4.14

Modified:
  virtualbox/trunk/010-linux-4-14.patch
  virtualbox/trunk/PKGBUILD

----------------------+
 010-linux-4-14.patch |   16 ++++++++++++++++
 PKGBUILD             |    4 ++--
 2 files changed, 18 insertions(+), 2 deletions(-)

Modified: 010-linux-4-14.patch
===================================================================
--- 010-linux-4-14.patch	2017-11-20 16:05:15 UTC (rev 267602)
+++ 010-linux-4-14.patch	2017-11-20 16:05:31 UTC (rev 267603)
@@ -154,3 +154,19 @@
  	.fb_probe = vboxfb_create,
  };
  
+diff --git a/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c b/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c
+index 3a3f00a..e7b3a69 100644
+--- a/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c
++++ b/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c
+@@ -357,7 +357,11 @@ static int vboxPciFileWrite(struct file* file, unsigned long long offset, unsign
+ 
+     fs_save = get_fs();
+     set_fs(get_ds());
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0)
++    ret = kernel_write(file, data, size, &offset);
++#else
+     ret = vfs_write(file, data, size, &offset);
++#endif
+     set_fs(fs_save);
+     if (ret < 0)
+         printk(KERN_DEBUG "vboxPciFileWrite: error %d\n", ret);

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-11-20 16:05:15 UTC (rev 267602)
+++ PKGBUILD	2017-11-20 16:05:31 UTC (rev 267603)
@@ -11,7 +11,7 @@
          'virtualbox-guest-utils-nox'
          'virtualbox-ext-vnc')
 pkgver=5.2.0
-pkgrel=2
+pkgrel=3
 arch=('x86_64')
 url='http://virtualbox.org'
 license=('GPL' 'custom')
@@ -89,7 +89,7 @@
             '6bdb017459532537199c399eefd3d84d8dc7f1786e79997caebd3b6eb5c75d9f'
             '8b7f241107863f82a5b0ae336aead0b3366a40103ff72dbebf33f54b512a0cbc'
             '1acc7014bcb3d9ca6da29eed813c3d6e91a688c43f9d93802fd4e3814f67ace4'
-            '078b41f4c9028cc6561c9a417d19408fa8321c8b5fd7ff130d71267a9bb11985'
+            '23b525a7dde26b81aabe4699069872c43d502c2ca957646b7d75f22cd8afd535'
             )
 
 prepare() {