Ticket #16966: memobj-2.patch
| File memobj-2.patch, 2.5 KB (added by , 7 years ago) |
|---|
-
memobj-r0drv-linux.c
old new 1062 1062 /* 1063 1063 * Get user pages. 1064 1064 */ 1065 #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0)1065 #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0) 1066 1066 if (R0Process == RTR0ProcHandleSelf()) 1067 1067 rc = get_user_pages(R3Ptr, /* Where from. */ 1068 1068 cPages, /* How many pages. */ 1069 # if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)1069 # if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0) 1070 1070 fWrite ? FOLL_WRITE | /* Write to memory. */ 1071 1071 FOLL_FORCE /* force write access. */ 1072 1072 : 0, /* Write to memory. */ … … 1086 1086 pTask->mm, /* Whose pages. */ 1087 1087 R3Ptr, /* Where from. */ 1088 1088 cPages, /* How many pages. */ 1089 # if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)1089 # if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0) 1090 1090 fWrite ? FOLL_WRITE | /* Write to memory. */ 1091 1091 FOLL_FORCE /* force write access. */ 1092 1092 : 0, /* Write to memory. */ … … 1096 1096 # endif 1097 1097 &pMemLnx->apPages[0], /* Page array. */ 1098 1098 papVMAs /* vmas */ 1099 # if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0)1099 # if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0) 1100 1100 , NULL /* locked */ 1101 1101 # endif 1102 1102 ); 1103 #else /* LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) */1103 #else /* LINUX_VERSION_CODE < KERNEL_VERSION(4, 4, 0) */ 1104 1104 rc = get_user_pages(pTask, /* Task for fault accounting. */ 1105 1105 pTask->mm, /* Whose pages. */ 1106 1106 R3Ptr, /* Where from. */ … … 1115 1115 # endif 1116 1116 &pMemLnx->apPages[0], /* Page array. */ 1117 1117 papVMAs); /* vmas */ 1118 #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) */1118 #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(4, 4, 0) */ 1119 1119 if (rc == cPages) 1120 1120 { 1121 1121 /*

