jengelh/virtualbox
SHA256
1
0
Fork 1
forked from pool/virtualbox
Code Pull Requests Activity

Accepting request 390257 from home:lwfinger:branches:Virtualization

Browse Source 
Fix for page-cache-release() no longer in kernel

OBS-URL: https://build.opensuse.org/request/show/390257
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=250
This commit is contained in:
Martin Pluskal 2016-04-16 11:47:44 +00:00 committed by Git OBS Bridge
parent 49a9ac25d6
commit ae2df53d7c
3 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
vbox-replace-page-cache-release.diff Normal file
View File

@ -0,0 +1,35 @@
Index: VirtualBox-5.0.17/src/VBox/Additions/linux/sharedfolders/regops.c
===================================================================
--- VirtualBox-5.0.17.orig/src/VBox/Additions/linux/sharedfolders/regops.c
+++ VirtualBox-5.0.17/src/VBox/Additions/linux/sharedfolders/regops.c
@@ -712,7 +712,7 @@ int sf_write_end(struct file *file, stru
}
unlock_page(page);
- page_cache_release(page);
+ put_page(page);
return nwritten;
}
Index: VirtualBox-5.0.17/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
===================================================================
--- VirtualBox-5.0.17.orig/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
+++ VirtualBox-5.0.17/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
@@ -578,7 +578,7 @@ DECLHIDDEN(int) rtR0MemObjNativeFree(RTR
{
if (!PageReserved(pMemLnx->apPages[iPage]))
SetPageDirty(pMemLnx->apPages[iPage]);
- page_cache_release(pMemLnx->apPages[iPage]);
+ put_page(pMemLnx->apPages[iPage]);
}
if (pTask && pTask->mm)
@@ -1081,7 +1081,7 @@ DECLHIDDEN(int) rtR0MemObjNativeLockUser
{
if (!PageReserved(pMemLnx->apPages[rc]))
SetPageDirty(pMemLnx->apPages[rc]);
- page_cache_release(pMemLnx->apPages[rc]);
+ put_page(pMemLnx->apPages[rc]);
}
up_read(&pTask->mm->mmap_sem);

6
virtualbox.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Apr 15 19:17:58 UTC 2016 - Larry.Finger@lwfinger.net
- Fix build error caused by removal of macro page_cache_release() from kernel.
File "vbox-replace-page-cache-release.diff" is used to modify code to use put_page() instead.
-------------------------------------------------------------------
Mon Apr 4 00:01:12 UTC 2016 - Larry.Finger@lwfinger.net

3
virtualbox.spec
View File

@ -87,6 +87,8 @@ Patch109: vbox-usb-warning.diff
Patch110: VirtualBox-5.0.17-r106108-r106140.patch
# Prevent Guest Additions from creating wrong SONAME
Patch111: vbox_prevent_wrong_SONAME.patch
# Fix removal of page_cache_release() macro in 4.6 kernels
Patch112: vbox-replace-page-cache-release.diff
#
BuildRequires: LibVNCServer-devel
BuildRequires: SDL-devel
@ -319,6 +321,7 @@ This package contains icons for guest desktop files that were created on the des
%patch109 -p1
%patch110 -p0
%patch111 -p1
%patch112 -p1
#copy user manual
cp %{SOURCE1} UserManual.pdf
#copy kbuild config