]> git.pld-linux.org Git - packages/VirtualBox.git/blame - kernel-4.9.256.patch
projects / packages / VirtualBox.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- fix building with kernel 4.9.256
[packages/VirtualBox.git] / kernel-4.9.256.patch
CommitLineData
dad60c7e
JR		 1diff -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
4@@ -1174,7 +1174,7 @@
5
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! */
10 #else
11 # define GET_USER_PAGES_API LINUX_VERSION_CODE
12 #endif
13@@ -1252,7 +1252,7 @@
14 # endif
15 &pMemLnx->apPages[0], /* Page array. */
16 papVMAs /* vmas */
17-# if GET_USER_PAGES_API >= KERNEL_VERSION(4, 10, 0)
18+# if GET_USER_PAGES_API >= KERNEL_VERSION(4, 11, 0)
19 , NULL /* locked */
20 # endif
21 );
22diff -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
25@@ -37,7 +37,7 @@
26 #include <iprt/thread.h>
27 #include "r0drv/mp-r0drv.h"
28
29-#if RTLNX_VER_MIN(4,10,0)
30+#if RTLNX_VER_MIN(4,11,0)
31
32 static enum cpuhp_state g_rtR0MpOnline;
33
34diff -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
37@@ -286,7 +286,7 @@
38 * Symlink inode operations.
39 */
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,
45 # else
46diff -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
49@@ -3335,7 +3335,7 @@
50 static int vbsf_vmlog_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
51 {
52 int rc;
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));
56 # else
57 SFLOGFLOW(("vbsf_vmlog_fault: vma=%p vmf=%p flags=%#x addr=%p\n", vma, vmf, vmf->flags, vmf->virtual_address));
58@@ -3384,7 +3384,7 @@
59 static int vbsf_vmlog_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
60 {
61 int rc;
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));
65 # else
66 SFLOGFLOW(("vbsf_vmlog_page_mkwrite: vma=%p vmf=%p flags=%#x addr=%p\n", vma, vmf, vmf->flags, vmf->virtual_address));
67@@ -3406,7 +3406,7 @@
68
69
70 /* Special page fault callback for mapping pages: */
71-# if RTLNX_VER_MIN(4,10,0)
72+# if RTLNX_VER_MIN(4,11,0)
73 static void vbsf_vmlog_map_pages(struct vm_fault *vmf, pgoff_t start, pgoff_t end)
74 {
75 SFLOGFLOW(("vbsf_vmlog_map_pages: vmf=%p (flags=%#x addr=%p) start=%p end=%p\n", vmf, vmf->flags, vmf->address, start, end));
76diff -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
79@@ -443,7 +443,7 @@
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;
86 # endif
87 #endif
88diff -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
91@@ -314,7 +314,7 @@
92 #if RTLNX_VER_MAX(5,10,0)
93 .init_mem_type = vbox_bo_init_mem_type,
94 #endif
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,
98 #endif
99 .evict_flags = vbox_bo_evict_flags,
100diff -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 @@
104
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! */
109 #else
110 # define GET_USER_PAGES_API LINUX_VERSION_CODE
111 #endif
112@@ -1252,7 +1252,7 @@
113 # endif
114 &pMemLnx->apPages[0], /* Page array. */
115 papVMAs /* vmas */
116-# if GET_USER_PAGES_API >= KERNEL_VERSION(4, 10, 0)
117+# if GET_USER_PAGES_API >= KERNEL_VERSION(4, 11, 0)
118 , NULL /* locked */
119 # endif
120 );
121diff -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
124@@ -37,7 +37,7 @@
125 #include <iprt/thread.h>
126 #include "r0drv/mp-r0drv.h"
127
128-#if RTLNX_VER_MIN(4,10,0)
129+#if RTLNX_VER_MIN(4,11,0)
130
131 static enum cpuhp_state g_rtR0MpOnline;
132
133diff -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
136@@ -319,7 +319,7 @@
137 #if RTLNX_VER_MAX(5,10,0)
138 .init_mem_type = vbox_bo_init_mem_type,
139 #endif
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,
143 #endif
144 .evict_flags = vbox_bo_evict_flags,
145diff -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
148@@ -286,7 +286,7 @@
149 * Symlink inode operations.
150 */
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,
156 # else
157diff -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)
162 {
163 int rc;
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));
167 # else
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)
171 {
172 int rc;
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));
176 # else
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
180
181 /* Special page fault callback for mapping pages: */
182-# if RTLNX_VER_MIN(4,10,0)
183+# if RTLNX_VER_MIN(4,11,0)
184 static void vbsf_vmlog_map_pages(struct vm_fault *vmf, pgoff_t start, pgoff_t end)
185 {
186 SFLOGFLOW(("vbsf_vmlog_map_pages: vmf=%p (flags=%#x addr=%p) start=%p end=%p\n", vmf, vmf->flags, vmf->address, start, end));
187diff -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
190@@ -443,7 +443,7 @@
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;
197 # endif
198 #endif
199diff -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 @@
203
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! */
208 #else
209 # define GET_USER_PAGES_API LINUX_VERSION_CODE
210 #endif
211@@ -1252,7 +1252,7 @@
212 # endif
213 &pMemLnx->apPages[0], /* Page array. */
214 papVMAs /* vmas */
215-# if GET_USER_PAGES_API >= KERNEL_VERSION(4, 10, 0)
216+# if GET_USER_PAGES_API >= KERNEL_VERSION(4, 11, 0)
217 , NULL /* locked */
218 # endif
219 );
220diff -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
223@@ -37,7 +37,7 @@
224 #include <iprt/thread.h>
225 #include "r0drv/mp-r0drv.h"
226
227-#if RTLNX_VER_MIN(4,10,0)
228+#if RTLNX_VER_MIN(4,11,0)
229
230 static enum cpuhp_state g_rtR0MpOnline;
231
VirtualBox - x86 hardware virtualizer
This page took 0.074557 seconds and 4 git commands to generate.