Index: /trunk/src/VBox/Additions/linux/drm/vbox_drv.c =================================================================== --- /trunk/src/VBox/Additions/linux/drm/vbox_drv.c (revision 86541) +++ /trunk/src/VBox/Additions/linux/drm/vbox_drv.c (revision 86542) @@ -263,5 +263,10 @@ }; -static int vbox_master_set(struct drm_device *dev, +#if RTLNX_VER_MIN(5,9,0) +static void +#else +static int +#endif + vbox_master_set(struct drm_device *dev, struct drm_file *file_priv, bool from_open) { @@ -282,5 +287,7 @@ mutex_unlock(&vbox->hw_mutex); +#if RTLNX_VER_MAX(5,9,0) return 0; +#endif } Index: /trunk/src/VBox/Additions/linux/drm/vbox_fb.c =================================================================== --- /trunk/src/VBox/Additions/linux/drm/vbox_fb.c (revision 86541) +++ /trunk/src/VBox/Additions/linux/drm/vbox_fb.c (revision 86542) @@ -406,5 +406,9 @@ vbox_bo_unreserve(bo); } +#if RTLNX_VER_MIN(5,9,0) + drm_gem_object_put(afb->obj); +#else drm_gem_object_put_unlocked(afb->obj); +#endif afb->obj = NULL; } Index: /trunk/src/VBox/Additions/linux/drm/vbox_main.c =================================================================== --- /trunk/src/VBox/Additions/linux/drm/vbox_main.c (revision 86541) +++ /trunk/src/VBox/Additions/linux/drm/vbox_main.c (revision 86542) @@ -47,5 +47,9 @@ if (vbox_fb->obj) +#if RTLNX_VER_MIN(5,9,0) + drm_gem_object_put(vbox_fb->obj); +#else drm_gem_object_put_unlocked(vbox_fb->obj); +#endif drm_framebuffer_cleanup(fb); @@ -222,5 +226,9 @@ kfree(vbox_fb); err_unref_obj: +#if RTLNX_VER_MIN(5,9,0) + drm_gem_object_put(obj); +#else drm_gem_object_put_unlocked(obj); +#endif return ERR_PTR(ret); } @@ -589,5 +597,9 @@ ret = drm_gem_handle_create(file, gobj, &handle); +#if RTLNX_VER_MIN(5,9,0) + drm_gem_object_put(gobj); +#else drm_gem_object_put_unlocked(gobj); +#endif if (ret) return ret; Index: /trunk/src/VBox/Additions/linux/drm/vbox_mode.c =================================================================== --- /trunk/src/VBox/Additions/linux/drm/vbox_mode.c (revision 86541) +++ /trunk/src/VBox/Additions/linux/drm/vbox_mode.c (revision 86542) @@ -885,5 +885,9 @@ vbox_bo_unreserve(bo); out_unref_obj: +#if RTLNX_VER_MIN(5,9,0) + drm_gem_object_put(obj); +#else drm_gem_object_put_unlocked(obj); +#endif return ret; Index: /trunk/src/VBox/Additions/linux/drm/vbox_ttm.c =================================================================== --- /trunk/src/VBox/Additions/linux/drm/vbox_ttm.c (revision 86541) +++ /trunk/src/VBox/Additions/linux/drm/vbox_ttm.c (revision 86542) @@ -446,5 +446,9 @@ static inline u64 vbox_bo_gpu_offset(struct vbox_bo *bo) { +#if RTLNX_VER_MIN(5,9,0) + return bo->bo.mem.start << PAGE_SHIFT; +#else return bo->bo.offset; +#endif } Index: /trunk/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c =================================================================== --- /trunk/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c (revision 86541) +++ /trunk/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c (revision 86542) @@ -1182,5 +1182,7 @@ else rc = get_user_pages_remote( +# if GET_USER_PAGES_API < KERNEL_VERSION(5, 9, 0) pTask, /* Task for fault accounting. */ +# endif pTask->mm, /* Whose pages. */ R3Ptr, /* Where from. */ Index: /trunk/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h =================================================================== --- /trunk/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h (revision 86541) +++ /trunk/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h (revision 86542) @@ -138,5 +138,9 @@ #include #include -#ifndef HAVE_UNLOCKED_IOCTL /* linux/fs.h defines this */ +/* linux/fs.h defines HAVE_UNLOCKED_IOCTL from 2.6.11 till 5.9, but its meaning remains valid */ +#if RTLNX_VER_MIN(5,9,0) +# define HAVE_UNLOCKED_IOCTL 1 +#endif +#if !defined(HAVE_UNLOCKED_IOCTL) && RTLNX_VER_MAX(2,6,38) # include #endif Index: /trunk/src/VBox/Runtime/r0drv/linux/thread2-r0drv-linux.c =================================================================== --- /trunk/src/VBox/Runtime/r0drv/linux/thread2-r0drv-linux.c (revision 86541) +++ /trunk/src/VBox/Runtime/r0drv/linux/thread2-r0drv-linux.c (revision 86542) @@ -55,49 +55,42 @@ DECLHIDDEN(int) rtThreadNativeSetPriority(PRTTHREADINT pThread, RTTHREADTYPE enmType) { -#if RTLNX_VER_MIN(2,6,11) - /* See comment near MAX_RT_PRIO in linux/sched.h for details on - sched_priority. */ - int iSchedClass = SCHED_NORMAL; - struct sched_param Param = { .sched_priority = MAX_PRIO - 1 }; + int iSchedClass = SCHED_FIFO; + int rc = VINF_SUCCESS; + struct sched_param Param = { 0 }; + + RT_NOREF_PV(pThread); +#if RTLNX_VER_MIN(5,9,0) + RT_NOREF_PV(iSchedClass); + RT_NOREF_PV(Param); +#endif switch (enmType) { - case RTTHREADTYPE_INFREQUENT_POLLER: - Param.sched_priority = MAX_RT_PRIO + 5; + case RTTHREADTYPE_IO: +#if RTLNX_VER_MAX(5,9,0) + /* Set max. priority to preempt all other threads on this CPU. */ + Param.sched_priority = MAX_RT_PRIO - 1; +#else + /* Effectively changes prio to 50 */ + sched_set_fifo(current); +#endif break; - - case RTTHREADTYPE_EMULATION: - Param.sched_priority = MAX_RT_PRIO + 4; + case RTTHREADTYPE_TIMER: +#if RTLNX_VER_MAX(5,9,0) + Param.sched_priority = 1; /* not 0 just in case */ +#else + /* Just one above SCHED_NORMAL class */ + sched_set_fifo_low(current); +#endif break; - - case RTTHREADTYPE_DEFAULT: - Param.sched_priority = MAX_RT_PRIO + 3; - break; - - case RTTHREADTYPE_MSG_PUMP: - Param.sched_priority = MAX_RT_PRIO + 2; - break; - - case RTTHREADTYPE_IO: - iSchedClass = SCHED_FIFO; - Param.sched_priority = MAX_RT_PRIO - 1; - break; - - case RTTHREADTYPE_TIMER: - iSchedClass = SCHED_FIFO; - Param.sched_priority = 1; /* not 0 just in case */ - break; - default: - AssertMsgFailed(("enmType=%d\n", enmType)); - return VERR_INVALID_PARAMETER; + /* pretend success instead of VERR_NOT_SUPPORTED */ + return rc; } - - sched_setscheduler(current, iSchedClass, &Param); -#else - RT_NOREF_PV(enmType); +#if RTLNX_VER_MAX(5,9,0) + if ((sched_setscheduler(current, iSchedClass, &Param)) != 0) { + rc = VERR_GENERAL_FAILURE; + } #endif - RT_NOREF_PV(pThread); - - return VINF_SUCCESS; + return rc; }