6ff234623b
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=285
34 lines
1.6 KiB
Diff
34 lines
1.6 KiB
Diff
Index: VirtualBox-5.1.8/src/VBox/Additions/linux/sharedfolders/dirops.c
|
|
===================================================================
|
|
--- VirtualBox-5.1.8.orig/src/VBox/Additions/linux/sharedfolders/dirops.c
|
|
+++ VirtualBox-5.1.8/src/VBox/Additions/linux/sharedfolders/dirops.c
|
|
@@ -747,8 +747,14 @@ static int sf_rmdir(struct inode *parent
|
|
* @param new_dentry new directory cache entry
|
|
* @returns 0 on success, Linux error code otherwise
|
|
*/
|
|
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0)
|
|
static int sf_rename(struct inode *old_parent, struct dentry *old_dentry,
|
|
struct inode *new_parent, struct dentry *new_dentry)
|
|
+#else
|
|
+static int sf_rename(struct inode *old_parent, struct dentry *old_dentry,
|
|
+ struct inode *new_parent, struct dentry *new_dentry,
|
|
+ unsigned int flags)
|
|
+#endif
|
|
{
|
|
int err = 0, rc = VINF_SUCCESS;
|
|
struct sf_glob_info *sf_g = GET_GLOB_INFO(old_parent->i_sb);
|
|
Index: VirtualBox-5.1.8/src/VBox/Additions/linux/drm/vbox_ttm.c
|
|
===================================================================
|
|
--- VirtualBox-5.1.8.orig/src/VBox/Additions/linux/drm/vbox_ttm.c
|
|
+++ VirtualBox-5.1.8/src/VBox/Additions/linux/drm/vbox_ttm.c
|
|
@@ -221,7 +221,8 @@ static int vbox_bo_move(struct ttm_buffe
|
|
struct ttm_mem_reg *new_mem)
|
|
{
|
|
int r;
|
|
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0)
|
|
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0) ||
|
|
+ LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
|
|
r = ttm_bo_move_memcpy(bo, evict, no_wait_gpu, new_mem);
|
|
#else
|
|
r = ttm_bo_move_memcpy(bo, evict, interruptible, no_wait_gpu, new_mem);
|