1 diff -ur VirtualBox-6.1.18/kernel/GuestDrivers/vboxguest/r0drv/linux/memobj-r0drv-linux.c VirtualBox-6.1.18-256/kernel/GuestDrivers/vboxguest/r0drv/linux/memobj-r0drv-linux.c
2 --- VirtualBox-6.1.18/kernel/GuestDrivers/vboxguest/r0drv/linux/memobj-r0drv-linux.c 2021-02-06 22:09:20.000000000 +0100
3 +++ VirtualBox-6.1.18-256/kernel/GuestDrivers/vboxguest/r0drv/linux/memobj-r0drv-linux.c 2021-02-06 22:08:19.038693668 +0100
6 /* openSUSE Leap 42.3 detection :-/ */
7 #if RTLNX_VER_RANGE(4,4,0, 4,6,0) && defined(FAULT_FLAG_REMOTE)
8 -# define GET_USER_PAGES_API KERNEL_VERSION(4, 10, 0) /* no typo! */
9 +# define GET_USER_PAGES_API KERNEL_VERSION(4, 11, 0) /* no typo! */
11 # define GET_USER_PAGES_API LINUX_VERSION_CODE
15 &pMemLnx->apPages[0], /* Page array. */
17 -# if GET_USER_PAGES_API >= KERNEL_VERSION(4, 10, 0)
18 +# if GET_USER_PAGES_API >= KERNEL_VERSION(4, 11, 0)
22 diff -ur VirtualBox-6.1.18/kernel/GuestDrivers/vboxguest/r0drv/linux/mpnotification-r0drv-linux.c VirtualBox-6.1.18-256/kernel/GuestDrivers/vboxguest/r0drv/linux/mpnotification-r0drv-linux.c
23 --- VirtualBox-6.1.18/kernel/GuestDrivers/vboxguest/r0drv/linux/mpnotification-r0drv-linux.c 2021-02-06 22:09:20.000000000 +0100
24 +++ VirtualBox-6.1.18-256/kernel/GuestDrivers/vboxguest/r0drv/linux/mpnotification-r0drv-linux.c 2021-02-06 21:54:24.869047375 +0100
26 #include <iprt/thread.h>
27 #include "r0drv/mp-r0drv.h"
29 -#if RTLNX_VER_MIN(4,10,0)
30 +#if RTLNX_VER_MIN(4,11,0)
32 static enum cpuhp_state g_rtR0MpOnline;
34 diff -ur VirtualBox-6.1.18/kernel/GuestDrivers/vboxsf/lnkops.c VirtualBox-6.1.18-256/kernel/GuestDrivers/vboxsf/lnkops.c
35 --- VirtualBox-6.1.18/kernel/GuestDrivers/vboxsf/lnkops.c 2021-02-06 22:09:20.000000000 +0100
36 +++ VirtualBox-6.1.18-256/kernel/GuestDrivers/vboxsf/lnkops.c 2021-02-06 21:54:24.869047375 +0100
38 * Symlink inode operations.
40 struct inode_operations vbsf_lnk_iops = {
41 -#if RTLNX_VER_MAX(4,10,0)
42 +#if RTLNX_VER_MAX(4,11,0)
43 # if RTLNX_VER_MIN(2,6,8)
44 .readlink = generic_readlink,
46 diff -ur VirtualBox-6.1.18/kernel/GuestDrivers/vboxsf/regops.c VirtualBox-6.1.18-256/kernel/GuestDrivers/vboxsf/regops.c
47 --- VirtualBox-6.1.18/kernel/GuestDrivers/vboxsf/regops.c 2021-02-06 22:09:20.000000000 +0100
48 +++ VirtualBox-6.1.18-256/kernel/GuestDrivers/vboxsf/regops.c 2021-02-06 21:54:24.869047375 +0100
50 static int vbsf_vmlog_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
53 -# if RTLNX_VER_MIN(4,10,0)
54 +# if RTLNX_VER_MIN(4,11,0)
55 SFLOGFLOW(("vbsf_vmlog_fault: vma=%p vmf=%p flags=%#x addr=%p\n", vma, vmf, vmf->flags, vmf->address));
57 SFLOGFLOW(("vbsf_vmlog_fault: vma=%p vmf=%p flags=%#x addr=%p\n", vma, vmf, vmf->flags, vmf->virtual_address));
59 static int vbsf_vmlog_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
62 -# if RTLNX_VER_MIN(4,10,0)
63 +# if RTLNX_VER_MIN(4,11,0)
64 SFLOGFLOW(("vbsf_vmlog_page_mkwrite: vma=%p vmf=%p flags=%#x addr=%p\n", vma, vmf, vmf->flags, vmf->address));
66 SFLOGFLOW(("vbsf_vmlog_page_mkwrite: vma=%p vmf=%p flags=%#x addr=%p\n", vma, vmf, vmf->flags, vmf->virtual_address));
68 SFLOGFLOW(("vbsf_vmlog_map_pages: returns\n"));
71 -# elif RTLNX_VER_MIN(4,10,0)
72 +# elif RTLNX_VER_MIN(4,11,0)
73 static void vbsf_vmlog_map_pages(struct vm_fault *vmf, pgoff_t start, pgoff_t end)
75 SFLOGFLOW(("vbsf_vmlog_map_pages: vmf=%p (flags=%#x addr=%p) start=%p end=%p\n", vmf, vmf->flags, vmf->address, start, end));
76 diff -ur VirtualBox-6.1.18/kernel/GuestDrivers/vboxsf/vfsmod.c VirtualBox-6.1.18-256/kernel/GuestDrivers/vboxsf/vfsmod.c
77 --- VirtualBox-6.1.18/kernel/GuestDrivers/vboxsf/vfsmod.c 2021-02-06 22:09:20.000000000 +0100
78 +++ VirtualBox-6.1.18-256/kernel/GuestDrivers/vboxsf/vfsmod.c 2021-02-06 21:54:24.869047375 +0100
80 trouches it after this point (we may screw up something). */
81 # if RTLNX_VER_RANGE(4,0,0, 4,2,0)
82 sb->s_bdi = pSuperInfo->bdi_org; /* (noop_backing_dev_info is not exported) */
83 -# elif RTLNX_VER_RANGE(2,6,34, 4,10,0)
84 +# elif RTLNX_VER_RANGE(2,6,34, 4,11,0)
85 sb->s_bdi = &noop_backing_dev_info;
88 diff -ur VirtualBox-6.1.18/kernel/GuestDrivers/vboxvideo/vbox_ttm.c VirtualBox-6.1.18-256/kernel/GuestDrivers/vboxvideo/vbox_ttm.c
89 --- VirtualBox-6.1.18/kernel/GuestDrivers/vboxvideo/vbox_ttm.c 2021-02-06 22:09:21.000000000 +0100
90 +++ VirtualBox-6.1.18-256/kernel/GuestDrivers/vboxvideo/vbox_ttm.c 2021-02-06 21:54:24.872380697 +0100
92 #if RTLNX_VER_MAX(5,10,0) && !RTLNX_RHEL_MAJ_PREREQ(8,5)
93 .init_mem_type = vbox_bo_init_mem_type,
95 -#if RTLNX_VER_MIN(4,10,0) || RTLNX_RHEL_MAJ_PREREQ(7,4)
96 +#if RTLNX_VER_MIN(4,11,0) || RTLNX_RHEL_MAJ_PREREQ(7,4)
97 .eviction_valuable = ttm_bo_eviction_valuable,
99 .evict_flags = vbox_bo_evict_flags,
100 diff -ur VirtualBox-6.1.18/kernel/HostDrivers/vboxdrv/r0drv/linux/memobj-r0drv-linux.c VirtualBox-6.1.18-256/kernel/HostDrivers/vboxdrv/r0drv/linux/memobj-r0drv-linux.c
101 --- VirtualBox-6.1.18/kernel/HostDrivers/vboxdrv/r0drv/linux/memobj-r0drv-linux.c 2021-02-06 22:09:22.000000000 +0100
102 +++ VirtualBox-6.1.18-256/kernel/HostDrivers/vboxdrv/r0drv/linux/memobj-r0drv-linux.c 2021-02-06 22:08:40.515390291 +0100
103 @@ -1174,7 +1174,7 @@
105 /* openSUSE Leap 42.3 detection :-/ */
106 #if RTLNX_VER_RANGE(4,4,0, 4,6,0) && defined(FAULT_FLAG_REMOTE)
107 -# define GET_USER_PAGES_API KERNEL_VERSION(4, 10, 0) /* no typo! */
108 +# define GET_USER_PAGES_API KERNEL_VERSION(4, 11, 0) /* no typo! */
110 # define GET_USER_PAGES_API LINUX_VERSION_CODE
112 @@ -1252,7 +1252,7 @@
114 &pMemLnx->apPages[0], /* Page array. */
116 -# if GET_USER_PAGES_API >= KERNEL_VERSION(4, 10, 0)
117 +# if GET_USER_PAGES_API >= KERNEL_VERSION(4, 11, 0)
121 diff -ur VirtualBox-6.1.18/kernel/HostDrivers/vboxdrv/r0drv/linux/mpnotification-r0drv-linux.c VirtualBox-6.1.18-256/kernel/HostDrivers/vboxdrv/r0drv/linux/mpnotification-r0drv-linux.c
122 --- VirtualBox-6.1.18/kernel/HostDrivers/vboxdrv/r0drv/linux/mpnotification-r0drv-linux.c 2021-02-06 22:09:22.000000000 +0100
123 +++ VirtualBox-6.1.18-256/kernel/HostDrivers/vboxdrv/r0drv/linux/mpnotification-r0drv-linux.c 2021-02-06 21:54:24.872380697 +0100
125 #include <iprt/thread.h>
126 #include "r0drv/mp-r0drv.h"
128 -#if RTLNX_VER_MIN(4,10,0)
129 +#if RTLNX_VER_MIN(4,11,0)
131 static enum cpuhp_state g_rtR0MpOnline;
133 diff -ur VirtualBox-6.1.18/src/VBox/Additions/linux/drm/vbox_ttm.c VirtualBox-6.1.18-256/src/VBox/Additions/linux/drm/vbox_ttm.c
134 --- VirtualBox-6.1.18/src/VBox/Additions/linux/drm/vbox_ttm.c 2021-01-07 16:34:24.000000000 +0100
135 +++ VirtualBox-6.1.18-256/src/VBox/Additions/linux/drm/vbox_ttm.c 2021-02-06 21:54:24.869047375 +0100
137 #if RTLNX_VER_MAX(5,10,0) && !RTLNX_RHEL_MAJ_PREREQ(8,5)
138 .init_mem_type = vbox_bo_init_mem_type,
140 -#if RTLNX_VER_MIN(4,10,0) || RTLNX_RHEL_MAJ_PREREQ(7,4)
141 +#if RTLNX_VER_MIN(4,11,0) || RTLNX_RHEL_MAJ_PREREQ(7,4)
142 .eviction_valuable = ttm_bo_eviction_valuable,
144 .evict_flags = vbox_bo_evict_flags,
145 diff -ur VirtualBox-6.1.18/src/VBox/Additions/linux/sharedfolders/lnkops.c VirtualBox-6.1.18-256/src/VBox/Additions/linux/sharedfolders/lnkops.c
146 --- VirtualBox-6.1.18/src/VBox/Additions/linux/sharedfolders/lnkops.c 2021-01-07 16:34:26.000000000 +0100
147 +++ VirtualBox-6.1.18-256/src/VBox/Additions/linux/sharedfolders/lnkops.c 2021-02-06 21:54:24.869047375 +0100
149 * Symlink inode operations.
151 struct inode_operations vbsf_lnk_iops = {
152 -#if RTLNX_VER_MAX(4,10,0)
153 +#if RTLNX_VER_MAX(4,11,0)
154 # if RTLNX_VER_MIN(2,6,8)
155 .readlink = generic_readlink,
157 diff -ur VirtualBox-6.1.18/src/VBox/Additions/linux/sharedfolders/regops.c VirtualBox-6.1.18-256/src/VBox/Additions/linux/sharedfolders/regops.c
158 --- VirtualBox-6.1.18/src/VBox/Additions/linux/sharedfolders/regops.c 2021-01-07 16:34:26.000000000 +0100
159 +++ VirtualBox-6.1.18-256/src/VBox/Additions/linux/sharedfolders/regops.c 2021-02-06 21:54:24.869047375 +0100
160 @@ -3335,7 +3335,7 @@
161 static int vbsf_vmlog_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
164 -# if RTLNX_VER_MIN(4,10,0)
165 +# if RTLNX_VER_MIN(4,11,0)
166 SFLOGFLOW(("vbsf_vmlog_fault: vma=%p vmf=%p flags=%#x addr=%p\n", vma, vmf, vmf->flags, vmf->address));
168 SFLOGFLOW(("vbsf_vmlog_fault: vma=%p vmf=%p flags=%#x addr=%p\n", vma, vmf, vmf->flags, vmf->virtual_address));
169 @@ -3384,7 +3384,7 @@
170 static int vbsf_vmlog_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
173 -# if RTLNX_VER_MIN(4,10,0)
174 +# if RTLNX_VER_MIN(4,11,0)
175 SFLOGFLOW(("vbsf_vmlog_page_mkwrite: vma=%p vmf=%p flags=%#x addr=%p\n", vma, vmf, vmf->flags, vmf->address));
177 SFLOGFLOW(("vbsf_vmlog_page_mkwrite: vma=%p vmf=%p flags=%#x addr=%p\n", vma, vmf, vmf->flags, vmf->virtual_address));
178 @@ -3406,7 +3406,7 @@
179 SFLOGFLOW(("vbsf_vmlog_map_pages: returns\n"));
182 -# elif RTLNX_VER_MIN(4,10,0)
183 +# elif RTLNX_VER_MIN(4,11,0)
184 static void vbsf_vmlog_map_pages(struct vm_fault *vmf, pgoff_t start, pgoff_t end)
186 SFLOGFLOW(("vbsf_vmlog_map_pages: vmf=%p (flags=%#x addr=%p) start=%p end=%p\n", vmf, vmf->flags, vmf->address, start, end));
187 diff -ur VirtualBox-6.1.18/src/VBox/Additions/linux/sharedfolders/vfsmod.c VirtualBox-6.1.18-256/src/VBox/Additions/linux/sharedfolders/vfsmod.c
188 --- VirtualBox-6.1.18/src/VBox/Additions/linux/sharedfolders/vfsmod.c 2021-01-07 16:34:26.000000000 +0100
189 +++ VirtualBox-6.1.18-256/src/VBox/Additions/linux/sharedfolders/vfsmod.c 2021-02-06 21:54:24.869047375 +0100
191 trouches it after this point (we may screw up something). */
192 # if RTLNX_VER_RANGE(4,0,0, 4,2,0)
193 sb->s_bdi = pSuperInfo->bdi_org; /* (noop_backing_dev_info is not exported) */
194 -# elif RTLNX_VER_RANGE(2,6,34, 4,10,0)
195 +# elif RTLNX_VER_RANGE(2,6,34, 4,11,0)
196 sb->s_bdi = &noop_backing_dev_info;
199 diff -ur VirtualBox-6.1.18/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c VirtualBox-6.1.18-256/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
200 --- VirtualBox-6.1.18/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c 2021-02-06 22:09:20.335448500 +0100
201 +++ VirtualBox-6.1.18-256/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c 2021-02-06 22:07:34.318634767 +0100
202 @@ -1174,7 +1174,7 @@
204 /* openSUSE Leap 42.3 detection :-/ */
205 #if RTLNX_VER_RANGE(4,4,0, 4,6,0) && defined(FAULT_FLAG_REMOTE)
206 -# define GET_USER_PAGES_API KERNEL_VERSION(4, 10, 0) /* no typo! */
207 +# define GET_USER_PAGES_API KERNEL_VERSION(4, 11, 0) /* no typo! */
209 # define GET_USER_PAGES_API LINUX_VERSION_CODE
211 @@ -1252,7 +1252,7 @@
213 &pMemLnx->apPages[0], /* Page array. */
215 -# if GET_USER_PAGES_API >= KERNEL_VERSION(4, 10, 0)
216 +# if GET_USER_PAGES_API >= KERNEL_VERSION(4, 11, 0)
220 diff -ur VirtualBox-6.1.18/src/VBox/Runtime/r0drv/linux/mpnotification-r0drv-linux.c VirtualBox-6.1.18-256/src/VBox/Runtime/r0drv/linux/mpnotification-r0drv-linux.c
221 --- VirtualBox-6.1.18/src/VBox/Runtime/r0drv/linux/mpnotification-r0drv-linux.c 2021-01-07 16:42:09.000000000 +0100
222 +++ VirtualBox-6.1.18-256/src/VBox/Runtime/r0drv/linux/mpnotification-r0drv-linux.c 2021-02-06 21:54:24.869047375 +0100
224 #include <iprt/thread.h>
225 #include "r0drv/mp-r0drv.h"
227 -#if RTLNX_VER_MIN(4,10,0)
228 +#if RTLNX_VER_MIN(4,11,0)
230 static enum cpuhp_state g_rtR0MpOnline;