Skip to content

Fix build error with kernel 6.1 due to prototype change #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JeevakaPrabu wants to merge 1 commit into
base: celadon/t/mr0/master
Choose a base branch
from
Open

Fix build error with kernel 6.1 due to prototype change #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions VBoxGuestAdditions/vboxguest-6.1.36/vboxguest/r0drv/linux/memobj-r0drv-linux.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1301,7 +1301,11 @@ DECLHIDDEN(int) rtR0MemObjNativeLockUser(PPRTR0MEMOBJINTERNAL ppMem, RTR3PTR R3P
while (rc-- > 0)
{
flush_dcache_page(pMemLnx->apPages[rc]);
#if RTLNX_VER_MIN(6,1,0)
vm_flags_set(papVMAs[rc], VM_DONTCOPY | VM_LOCKED);
#else
papVMAs[rc]->vm_flags |= VM_DONTCOPY | VM_LOCKED;
#endif
}

LNX_MM_UP_READ(pTask->mm);
Expand Down Expand Up @@ -1771,7 +1775,11 @@ DECLHIDDEN(int) rtR0MemObjNativeMapUser(PPRTR0MEMOBJINTERNAL ppMem, RTR0MEMOBJ p
/* Thes flags help making 100% sure some bad stuff wont happen (swap, core, ++).
* See remap_pfn_range() in mm/memory.c */
#if RTLNX_VER_MIN(3,7,0)
#if RTLNX_VER_MIN(6,1,0)
vm_flags_set(vma, VM_DONTEXPAND | VM_DONTDUMP);
#else
vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP;
#endif
#else
vma->vm_flags |= VM_RESERVED;
#endif
Expand Down
13 changes: 13 additions & 0 deletions VBoxGuestAdditions/vboxguest-6.1.36/vboxsf/regops.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2185,7 +2185,12 @@ static int vbsf_iter_lock_pages(struct iov_iter *iter, bool fWrite, struct vbsf_
while (!iov_iter_single_seg_count(iter)) /* Old code didn't skip empty segments which caused EFAULTs. */
iov_iter_advance(iter, 0);
# endif

#if RTLNX_VER_MIN(6,0,0)
cbSegRet = iov_iter_get_pages2(iter, papPages, iov_iter_count(iter), cMaxPages, &offPage0);
#else
cbSegRet = iov_iter_get_pages(iter, papPages, iov_iter_count(iter), cMaxPages, &offPage0);
#endif
if (cbSegRet > 0) {
iov_iter_advance(iter, cbSegRet);
cbChunk = (size_t)cbSegRet;
Expand All @@ -2211,7 +2216,11 @@ static int vbsf_iter_lock_pages(struct iov_iter *iter, bool fWrite, struct vbsf_
iov_iter_advance(iter, 0);
cbSeg = iov_iter_single_seg_count(iter);
}
#if RTLNX_VER_MIN(6,0,0)
cbSegRet = iov_iter_get_pages2(iter, &papPages[cPages], iov_iter_count(iter), 1, &offPgProbe);
#else
cbSegRet = iov_iter_get_pages(iter, &papPages[cPages], iov_iter_count(iter), 1, &offPgProbe);
#endif
if (cbSegRet > 0) {
iov_iter_advance(iter, cbSegRet); /** @todo maybe not do this if we stash the page? */
Assert(offPgProbe + cbSegRet <= PAGE_SIZE);
Expand All @@ -2229,7 +2238,11 @@ static int vbsf_iter_lock_pages(struct iov_iter *iter, bool fWrite, struct vbsf_
*/
cbSeg -= cbSegRet;
if (cbSeg > 0) {
#if RTLNX_VER_MIN(6,0,0)
cbSegRet = iov_iter_get_pages2(iter, &papPages[cPages], iov_iter_count(iter), cMaxPages, &offPgProbe);
#else
cbSegRet = iov_iter_get_pages(iter, &papPages[cPages], iov_iter_count(iter), cMaxPages, &offPgProbe);
#endif
if (cbSegRet > 0) {
size_t const cPgRet = RT_ALIGN_Z((size_t)cbSegRet, PAGE_SIZE) >> PAGE_SHIFT;
Assert(offPgProbe == 0);
Expand Down