| 85 | |
| 86 | {{{ |
| 87 | trunk $ svn diff |
| 88 | Index: src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c |
| 89 | =================================================================== |
| 90 | --- src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c (revision 140172) |
| 91 | +++ src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c (working copy) |
| 92 | @@ -1181,7 +1181,9 @@ |
| 93 | */ |
| 94 | else |
| 95 | rc = get_user_pages_remote( |
| 96 | +# if GET_USER_PAGES_API < KERNEL_VERSION(5, 9, 0) |
| 97 | pTask, /* Task for fault accounting. */ |
| 98 | +# endif |
| 99 | pTask->mm, /* Whose pages. */ |
| 100 | R3Ptr, /* Where from. */ |
| 101 | cPages, /* How many pages. */ |
| 102 | Index: src/VBox/Runtime/r0drv/linux/the-linux-kernel.h |
| 103 | =================================================================== |
| 104 | --- src/VBox/Runtime/r0drv/linux/the-linux-kernel.h (revision 140172) |
| 105 | +++ src/VBox/Runtime/r0drv/linux/the-linux-kernel.h (working copy) |
| 106 | @@ -137,7 +137,11 @@ |
| 107 | #include <linux/interrupt.h> |
| 108 | #include <linux/completion.h> |
| 109 | #include <linux/compiler.h> |
| 110 | -#ifndef HAVE_UNLOCKED_IOCTL /* linux/fs.h defines this */ |
| 111 | +/* linux/fs.h defines HAVE_UNLOCKED_IOCTL from 2.6.11 till 5.9, but its meaning remains valid */ |
| 112 | +#if RTLNX_VER_MIN(5,9,0) |
| 113 | +# define HAVE_UNLOCKED_IOCTL 1 |
| 114 | +#endif |
| 115 | +#if !defined(HAVE_UNLOCKED_IOCTL) && RTLNX_VER_MAX(2,6,38) |
| 116 | # include <linux/smp_lock.h> |
| 117 | #endif |
| 118 | /* For the shared folders module */ |
| 119 | }}} |