1 --- VirtualBox-5.2.6/GuestDrivers/vboxguest/VBoxGuest-linux.c 2018-01-15 14:49:51.000000000 +0000
2 +++ VirtualBox-5.2.6/GuestDrivers/vboxguest/VBoxGuest-linux.c 2018-01-18 11:31:11.000000000 +0000
4 # define VBOXGUEST_WITH_INPUT_DRIVER
7 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
8 +# define CONST_4_15 const
13 #include "VBoxGuestInternal.h"
14 #ifdef VBOXGUEST_WITH_INPUT_DRIVER
15 # include <linux/input.h>
16 @@ -1058,7 +1064,7 @@ void VGDrvNativeISRMousePollEvent(PVBOXG
17 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
19 /** log and dbg_log parameter setter. */
20 -static int vgdrvLinuxParamLogGrpSet(const char *pszValue, struct kernel_param *pParam)
21 +static int vgdrvLinuxParamLogGrpSet(const char *pszValue, CONST_4_15 struct kernel_param *pParam)
25 @@ -1073,7 +1079,7 @@ static int vgdrvLinuxParamLogGrpSet(cons
28 /** log and dbg_log parameter getter. */
29 -static int vgdrvLinuxParamLogGrpGet(char *pszBuf, struct kernel_param *pParam)
30 +static int vgdrvLinuxParamLogGrpGet(char *pszBuf, CONST_4_15 struct kernel_param *pParam)
32 PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelGetDefaultInstance();
34 @@ -1084,7 +1090,7 @@ static int vgdrvLinuxParamLogGrpGet(char
37 /** log and dbg_log_flags parameter setter. */
38 -static int vgdrvLinuxParamLogFlagsSet(const char *pszValue, struct kernel_param *pParam)
39 +static int vgdrvLinuxParamLogFlagsSet(const char *pszValue, CONST_4_15 struct kernel_param *pParam)
43 @@ -1098,7 +1104,7 @@ static int vgdrvLinuxParamLogFlagsSet(co
46 /** log and dbg_log_flags parameter getter. */
47 -static int vgdrvLinuxParamLogFlagsGet(char *pszBuf, struct kernel_param *pParam)
48 +static int vgdrvLinuxParamLogFlagsGet(char *pszBuf, CONST_4_15 struct kernel_param *pParam)
50 PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelGetDefaultInstance();
52 @@ -1109,7 +1115,7 @@ static int vgdrvLinuxParamLogFlagsGet(ch
55 /** log and dbg_log_dest parameter setter. */
56 -static int vgdrvLinuxParamLogDstSet(const char *pszValue, struct kernel_param *pParam)
57 +static int vgdrvLinuxParamLogDstSet(const char *pszValue, CONST_4_15 struct kernel_param *pParam)
61 @@ -1123,7 +1129,7 @@ static int vgdrvLinuxParamLogDstSet(cons
64 /** log and dbg_log_dest parameter getter. */
65 -static int vgdrvLinuxParamLogDstGet(char *pszBuf, struct kernel_param *pParam)
66 +static int vgdrvLinuxParamLogDstGet(char *pszBuf, CONST_4_15 struct kernel_param *pParam)
68 PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelGetDefaultInstance();
70 @@ -1134,7 +1140,7 @@ static int vgdrvLinuxParamLogDstGet(char
73 /** r3_log_to_host parameter setter. */
74 -static int vgdrvLinuxParamR3LogToHostSet(const char *pszValue, struct kernel_param *pParam)
75 +static int vgdrvLinuxParamR3LogToHostSet(const char *pszValue, CONST_4_15 struct kernel_param *pParam)
79 @@ -1152,7 +1158,7 @@ static int vgdrvLinuxParamR3LogToHostSet
82 /** r3_log_to_host parameter getter. */
83 -static int vgdrvLinuxParamR3LogToHostGet(char *pszBuf, struct kernel_param *pParam)
84 +static int vgdrvLinuxParamR3LogToHostGet(char *pszBuf, CONST_4_15 struct kernel_param *pParam)
86 strcpy(pszBuf, g_DevExt.fLoggingEnabled ? "enabled" : "disabled");
87 return strlen(pszBuf);
88 --- VirtualBox-5.2.6/GuestDrivers/vboxvideo/vbox_mode.c 2018-01-17 02:48:28.000000000 +0000
89 +++ VirtualBox-5.2.6/GuestDrivers/vboxvideo/vbox_mode.c 2018-01-18 11:31:11.000000000 +0000
90 @@ -396,7 +397,11 @@ static struct drm_encoder *vbox_best_sin
92 /* pick the encoder ids */
94 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
95 + return drm_encoder_find(connector->dev, NULL, enc_id);
97 return drm_encoder_find(connector->dev, enc_id);