km: Migrate to kernel version 5.4

The major changes include:

 - reservation_object renamed to dma_resv
 - dma_resv_reserve_shared takes new 'num_fences' parameter
 - vm_insert_mixed removed, use vmf_insert_mixed instead
 - access_ok does not need direction parameter
 - drm_dev_unref renamed to drm_dev_put
 - platform data for reset control no longer needed

Signed-off-by: Andrew F. Davis <afd@ti.com>

7 files changed, 60 insertions, 113 deletions

diff --git a/eurasia_km/services4/srvkm/env/linux/dmabuf.h b/eurasia_km/services4/srvkm/env/linux/dmabuf.h
index 9a09464..b0007f6 100644
--- a/eurasia_km/services4/srvkm/env/linux/dmabuf.h
+++ b/eurasia_km/services4/srvkm/env/linux/dmabuf.h
@@ -50,12 +50,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "servicesext.h"
 
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0))
-#include <linux/reservation.h>
+#include <linux/dma-resv.h>
 #include "pvr_bridge.h"
 
 struct dmabuf_resvinfo
 {
-        struct reservation_object *resv;
+        struct dma_resv *resv;
 };
 
 static inline void *DmaBufGetReservationObject(IMG_HANDLE hSync)
diff --git a/eurasia_km/services4/srvkm/env/linux/mmap.c b/eurasia_km/services4/srvkm/env/linux/mmap.c
index 3a2a16b..0c3fe26 100644
--- a/eurasia_km/services4/srvkm/env/linux/mmap.c
+++ b/eurasia_km/services4/srvkm/env/linux/mmap.c
@@ -709,7 +709,7 @@ DoMapToUser(LinuxMemArea *psLinuxMemArea,
          * that attempt to interpret it).
          * The only alternative is to use VM_INSERT_PAGE, which requires
          * finding the page structure corresponding to each page, or
-         * if mixed maps are supported (VM_MIXEDMAP), vm_insert_mixed.
+         * if mixed maps are supported (VM_MIXEDMAP), vmf_insert_mixed.
          */
         IMG_UINTPTR_T ulVMAPos;
         IMG_UINTPTR_T uiByteEnd = uiByteOffset + uiByteSize;
@@ -766,7 +766,7 @@ DoMapToUser(LinuxMemArea *psLinuxMemArea,
         for(uiPA = uiByteOffset; uiPA < uiByteEnd; uiPA += PAGE_SIZE)
         {
             IMG_UINTPTR_T pfn;
-            IMG_INT result;
+            IMG_INT result = 0;
             IMG_BOOL bMapPage = IMG_TRUE;
 
                 if (psLinuxMemArea->hBMHandle)
@@ -785,7 +785,14 @@ DoMapToUser(LinuxMemArea *psLinuxMemArea,
 #if defined(PVR_MAKE_ALL_PFNS_SPECIAL)
                     if (bMixedMap)
                     {
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,5,0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,20,0))
+                        pfn_t pfns = { pfn };
+                        vm_fault_t vmf;
+
+                        vmf = vmf_insert_mixed(ps_vma, ulVMAPos, pfns);
+                        if (vmf & VM_FAULT_ERROR)
+                                result = vm_fault_to_errno(vmf, 0);
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,5,0))
                         pfn_t pfns = { pfn };
 
                         result = vm_insert_mixed(ps_vma, ulVMAPos, pfns);
diff --git a/eurasia_km/services4/srvkm/env/linux/module.c b/eurasia_km/services4/srvkm/env/linux/module.c
index d7a0268..c7b3c50 100644
--- a/eurasia_km/services4/srvkm/env/linux/module.c
+++ b/eurasia_km/services4/srvkm/env/linux/module.c
@@ -47,10 +47,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #endif
 #endif
 
-#if (AM_VERSION == 3)  || (AM_VERSION == 4)
-#include <linux/platform_data/sgx-omap.h>
-#endif
-
 #if defined(SUPPORT_DRI_DRM) && !defined(SUPPORT_DRI_DRM_PLUGIN)
 #define PVR_MOD_STATIC
 #else
@@ -372,21 +368,8 @@ static int __devinit PVRSRVDriverProbe(LDM_DEV *pDevice, const struct pci_device
 #endif
 {
         SYS_DATA *psSysData;
-#if (AM_VERSION == 3)  || (AM_VERSION == 4)
-        int ret;
-        struct device *dev = &pDevice->dev;
-        struct gfx_sgx_platform_data *pdata = dev->platform_data;
-#endif
 
         PVR_TRACE(("PVRSRVDriverProbe(pDevice=%p)", pDevice));
-#if (AM_VERSION == 3)  || (AM_VERSION == 4)
-        if (pdata && pdata->deassert_reset) {
-                ret = pdata->deassert_reset(pDevice, pdata->reset_name);
-                if (ret) {
-                        dev_err(dev, "Unable to reset SGX!\n");
-                }
-        }
-#endif
 
 #if 0   /* INTEGRATION_POINT */
         /* Some systems require device-specific system initialisation.
diff --git a/eurasia_km/services4/srvkm/env/linux/osfunc.c b/eurasia_km/services4/srvkm/env/linux/osfunc.c
index aa558d1..5d54b95 100644
--- a/eurasia_km/services4/srvkm/env/linux/osfunc.c
+++ b/eurasia_km/services4/srvkm/env/linux/osfunc.c
@@ -3420,19 +3420,8 @@ PVRSRV_ERROR OSCopyFromUser( IMG_PVOID pvProcess,
 ******************************************************************************/
 IMG_BOOL OSAccessOK(IMG_VERIFY_TEST eVerification, IMG_VOID *pvUserPtr, IMG_SIZE_T uiBytes)
 {
-    IMG_INT linuxType;
-
-    if (eVerification == PVR_VERIFY_READ)
-    {
-        linuxType = VERIFY_READ;
-    }
-    else
-    {
-        PVR_ASSERT(eVerification == PVR_VERIFY_WRITE);
-        linuxType = VERIFY_WRITE;
-    }
-
-    return access_ok(linuxType, pvUserPtr, uiBytes);
+    (void)eVerification; /* unused */
+    return access_ok(pvUserPtr, uiBytes);
 }
 
 typedef enum _eWrapMemType_
diff --git a/eurasia_km/services4/srvkm/env/linux/pvr_drm.c b/eurasia_km/services4/srvkm/env/linux/pvr_drm.c
index 7a7e628..f479f89 100644
--- a/eurasia_km/services4/srvkm/env/linux/pvr_drm.c
+++ b/eurasia_km/services4/srvkm/env/linux/pvr_drm.c
@@ -49,10 +49,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #endif
 #endif
 
-#if (AM_VERSION == 3)  || (AM_VERSION == 4)
-#include <linux/platform_data/sgx-omap.h>
-#endif
-
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
@@ -272,13 +268,6 @@ exit:
 DRI_DRM_STATIC void
 PVRSRVDrmUnload(struct drm_device *dev)
 {
-#if (AM_VERSION == 3) || (AM_VERSION == 4)
-        int ret;
-        struct device *pDev = dev->dev;
-        struct platform_device *pDevice = to_platform_device(pDev);
-        struct gfx_sgx_platform_data *pdata = pDev->platform_data;
-#endif
-
         PVR_TRACE(("PVRSRVDrmUnload"));
 
 #if defined(DISPLAY_CONTROLLER)
@@ -287,15 +276,6 @@ PVRSRVDrmUnload(struct drm_device *dev)
 
         PVRCore_Cleanup();
 
-#if (AM_VERSION == 3) || (AM_VERSION == 4)
-        if (pdata && pdata->assert_reset) {
-                ret = pdata->assert_reset(pDevice, pdata->reset_name);
-                if (ret) {
-                        dev_err(pDev, "Unable to reset SGX!\n");
-                }
-        }
-#endif
-
 #if defined(PDUMP)
         dbgdrv_cleanup();
 #endif
@@ -705,21 +685,9 @@ PVRSRVDrmProbe(struct platform_device *pDevice)
         int ret;
         struct device *dev = &pDevice->dev;
         struct drm_device *drm_dev;
-#if (AM_VERSION == 3)  || (AM_VERSION == 4)
-        struct gfx_sgx_platform_data *pdata = dev->platform_data;
-#endif
 
         PVR_TRACE(("PVRSRVDrmProbe"));
 
-#if (AM_VERSION == 3)  || (AM_VERSION == 4)
-        if (pdata && pdata->deassert_reset) {
-                ret = pdata->deassert_reset(pDevice, pdata->reset_name);
-                if (ret) {
-                        dev_err(dev, "Unable to reset SGX!\n");
-                }
-        }
-#endif
-
         LinuxSetCMARegion(of_reserved_mem_device_init(&pDevice->dev) ?
                         IMG_FALSE: IMG_TRUE);
 
@@ -736,7 +704,7 @@ PVRSRVDrmProbe(struct platform_device *pDevice)
         ret = drm_dev_register(drm_dev, 0);
         if (ret != 0) {
                 dev_err(dev, "Unable to register SGX DRM device\n");
-                drm_dev_unref(drm_dev);
+                drm_dev_put(drm_dev);
         }
 
         return ret;
@@ -754,7 +722,7 @@ PVRSRVDrmRemove(struct platform_device *pDevice)
         PVR_TRACE(("PVRSRVDrmRemove"));
 
         drm_dev_unregister(drm_dev);
-        drm_dev_unref(drm_dev);
+        drm_dev_put(drm_dev);
 
         return 0;
 }
diff --git a/eurasia_km/services4/srvkm/env/linux/pvr_linux_fence.c b/eurasia_km/services4/srvkm/env/linux/pvr_linux_fence.c
index cf9b4b8..c3c2fdf 100644
--- a/eurasia_km/services4/srvkm/env/linux/pvr_linux_fence.c
+++ b/eurasia_km/services4/srvkm/env/linux/pvr_linux_fence.c
@@ -60,7 +60,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #else
 #include <linux/fence.h>
 #endif
-#include <linux/reservation.h>
+#include <linux/dma-resv.h>
 #include <linux/list.h>
 
 #include "dmabuf.h"
@@ -410,10 +410,10 @@ static inline int update_reservation_return_value(int ret, bool blocked_on_write
         return ret < 0 ? ret : (ret ? 0 : (blocked_on_write ? BLOCKED_ON_WRITE : BLOCKED_ON_READ));
 }
 
-static int update_reservation_object_fences_dst(struct pvr_fence_frame *pvr_fence_frame,
-                                                struct reservation_object *resv)
+static int update_dma_resv_fences_dst(struct pvr_fence_frame *pvr_fence_frame,
+                                                struct dma_resv *resv)
 {
-        struct reservation_object_list *flist;
+        struct dma_resv_list *flist;
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0))
         struct dma_fence *fence_to_signal;
 #else
@@ -424,7 +424,7 @@ static int update_reservation_object_fences_dst(struct pvr_fence_frame *pvr_fenc
         unsigned i;
         int ret;
 
-        flist = reservation_object_get_list(resv);
+        flist = dma_resv_get_list(resv);
         shared_fence_count = flist ? flist->shared_count : 0;
 
         fence_to_signal = create_fence_to_signal(pvr_fence_frame);
@@ -435,16 +435,16 @@ static int update_reservation_object_fences_dst(struct pvr_fence_frame *pvr_fenc
 
         if (!pvr_fence_frame->have_blocking_fences)
         {
-                reservation_object_add_excl_fence(resv, fence_to_signal);
+                dma_resv_add_excl_fence(resv, fence_to_signal);
                 return 0;
         }
 
         if (!shared_fence_count)
         {
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0))
-                struct dma_fence *fence = reservation_object_get_excl(resv);
+                struct dma_fence *fence = dma_resv_get_excl(resv);
 #else
-                struct fence *fence = reservation_object_get_excl(resv);
+                struct fence *fence = dma_resv_get_excl(resv);
 #endif
 
                 if (fence && is_blocking_fence(fence, pvr_fence_frame))
@@ -468,7 +468,7 @@ static int update_reservation_object_fences_dst(struct pvr_fence_frame *pvr_fenc
                         ret = 1;
                 }
 
-                reservation_object_add_excl_fence(resv, fence_to_signal);
+                dma_resv_add_excl_fence(resv, fence_to_signal);
                 return update_reservation_return_value(ret, true);
         }
 
@@ -476,9 +476,9 @@ static int update_reservation_object_fences_dst(struct pvr_fence_frame *pvr_fenc
         {
 
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0))
-                struct dma_fence *fence = rcu_dereference_protected(flist->shared[i], reservation_object_held(resv));
+                struct dma_fence *fence = rcu_dereference_protected(flist->shared[i], dma_resv_held(resv));
 #else
-                struct fence *fence = rcu_dereference_protected(flist->shared[i], reservation_object_held(resv));
+                struct fence *fence = rcu_dereference_protected(flist->shared[i], dma_resv_held(resv));
 #endif
 
                 if (is_blocking_fence(fence, pvr_fence_frame))
@@ -495,9 +495,9 @@ static int update_reservation_object_fences_dst(struct pvr_fence_frame *pvr_fenc
                         for (i = 0; i < blocking_fence_count; i++)
                         {
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0))
-                                struct dma_fence *fence = rcu_dereference_protected(flist->shared[i], reservation_object_held(resv));
+                                struct dma_fence *fence = rcu_dereference_protected(flist->shared[i], dma_resv_held(resv));
 #else
-                                struct fence *fence = rcu_dereference_protected(flist->shared[i], reservation_object_held(resv));
+                                struct fence *fence = rcu_dereference_protected(flist->shared[i], dma_resv_held(resv));
 #endif
 
                                 if (is_blocking_fence(fence, pvr_fence_frame))
@@ -520,14 +520,14 @@ static int update_reservation_object_fences_dst(struct pvr_fence_frame *pvr_fenc
                 }
         }
 
-        reservation_object_add_excl_fence(resv, fence_to_signal);
+        dma_resv_add_excl_fence(resv, fence_to_signal);
         return update_reservation_return_value(ret, false);
 }
 
-static int update_reservation_object_fences_src(struct pvr_fence_frame *pvr_fence_frame,
-                                                struct reservation_object *resv)
+static int update_dma_resv_fences_src(struct pvr_fence_frame *pvr_fence_frame,
+                                                struct dma_resv *resv)
 {
-        struct reservation_object_list *flist;
+        struct dma_resv_list *flist;
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0))
         struct dma_fence *fence_to_signal = NULL;
         struct dma_fence *blocking_fence = NULL;
@@ -542,7 +542,7 @@ static int update_reservation_object_fences_src(struct pvr_fence_frame *pvr_fenc
 
         if (!pvr_fence_frame->have_blocking_fences)
         {
-                ret = reservation_object_reserve_shared(resv);
+                ret = dma_resv_reserve_shared(resv, 1);
                 if (ret)
                 {
                         return ret;
@@ -554,12 +554,12 @@ static int update_reservation_object_fences_src(struct pvr_fence_frame *pvr_fenc
                         return -ENOMEM;
                 }
 
-                reservation_object_add_shared_fence(resv, fence_to_signal);
+                dma_resv_add_shared_fence(resv, fence_to_signal);
 
                 return 0;
         }
 
-        flist = reservation_object_get_list(resv);
+        flist = dma_resv_get_list(resv);
         shared_fence_count = flist ? flist->shared_count : 0;
 
         /*
@@ -571,9 +571,9 @@ static int update_reservation_object_fences_src(struct pvr_fence_frame *pvr_fenc
         for (i = 0; i < shared_fence_count; i++)
         {
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0))
-                struct dma_fence *fence = rcu_dereference_protected(flist->shared[i], reservation_object_held(resv));
+                struct dma_fence *fence = rcu_dereference_protected(flist->shared[i], dma_resv_held(resv));
 #else
-                struct fence *fence = rcu_dereference_protected(flist->shared[i], reservation_object_held(resv));
+                struct fence *fence = rcu_dereference_protected(flist->shared[i], dma_resv_held(resv));
 #endif
 
                 if (is_pvr_fence(fence))
@@ -590,7 +590,7 @@ static int update_reservation_object_fences_src(struct pvr_fence_frame *pvr_fenc
 
         if (reserve)
         {
-                ret = reservation_object_reserve_shared(resv);
+                ret = dma_resv_reserve_shared(resv, 1);
                 if (ret)
                 {
                         return ret;
@@ -606,9 +606,9 @@ static int update_reservation_object_fences_src(struct pvr_fence_frame *pvr_fenc
         if (!blocking_fence && !shared_fence_count)
         {
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0))
-                struct dma_fence *fence = reservation_object_get_excl(resv);
+                struct dma_fence *fence = dma_resv_get_excl(resv);
 #else
-                struct fence *fence = reservation_object_get_excl(resv);
+                struct fence *fence = dma_resv_get_excl(resv);
 #endif
 
                 if (fence && is_blocking_fence(fence, pvr_fence_frame))
@@ -639,7 +639,7 @@ static int update_reservation_object_fences_src(struct pvr_fence_frame *pvr_fenc
                 ret = 1;
         }
 
-        reservation_object_add_shared_fence(resv, fence_to_signal);
+        dma_resv_add_shared_fence(resv, fence_to_signal);
 
         return update_reservation_return_value(ret, !shared_fence_count);
 }
@@ -860,7 +860,7 @@ IMG_HANDLE PVRLinuxFenceContextCreate(PVRSRV_KERNEL_SYNC_INFO *psSyncInfo, IMG_H
         return (IMG_HANDLE)pvr_fence_context;
 }
 
-static int process_reservation_object(struct pvr_fence_context *pvr_fence_context, struct reservation_object *resv, bool is_dst, u32 tag, bool have_blocking_fences)
+static int process_reservation_object(struct pvr_fence_context *pvr_fence_context, struct dma_resv *resv, bool is_dst, u32 tag, bool have_blocking_fences)
 {
         PVRSRV_KERNEL_SYNC_INFO *psSyncInfo = pvr_fence_context->psSyncInfo;
         struct pvr_fence_frame *pvr_fence_frame;
@@ -880,8 +880,8 @@ static int process_reservation_object(struct pvr_fence_context *pvr_fence_contex
         INIT_LIST_HEAD(&pvr_fence_frame->fence_frame_list);
 
         ret = is_dst ?
-                update_reservation_object_fences_dst(pvr_fence_frame, resv) :
-                update_reservation_object_fences_src(pvr_fence_frame, resv);
+                update_dma_resv_fences_dst(pvr_fence_frame, resv) :
+                update_dma_resv_fences_src(pvr_fence_frame, resv);
         if (ret < 0)
         {
                 kfree(pvr_fence_frame);
@@ -915,7 +915,7 @@ static int process_reservation_object(struct pvr_fence_context *pvr_fence_contex
 static int process_syncinfo(PVRSRV_KERNEL_SYNC_INFO *psSyncInfo, bool is_dst, u32 tag, bool have_blocking_fences)
 {
         struct pvr_fence_context *pvr_fence_context = (struct pvr_fence_context *)psSyncInfo->hFenceContext;
-        struct reservation_object *resv;
+        struct dma_resv *resv;
         int ret = 0;
 
         if (!pvr_fence_context)
@@ -982,11 +982,11 @@ static inline bool fence_is_blocking(const struct fence *fence,
         return true;
 }
 
-static bool resv_is_blocking(struct reservation_object *resv,
+static bool resv_is_blocking(struct dma_resv *resv,
                                       const PVRSRV_KERNEL_SYNC_INFO *psSyncInfo,
                                       bool is_dst)
 {
-        struct reservation_object_list *flist;
+        struct dma_resv_list *flist;
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0))
         struct dma_fence *fence;
 #else
@@ -1070,7 +1070,7 @@ static unsigned count_reservation_objects(unsigned num_syncs,
                 pvr_fence_context = (struct pvr_fence_context *)psSyncInfo->hFenceContext;
                 if (pvr_fence_context)
                 {
-                        struct reservation_object *resv;
+                        struct dma_resv *resv;
 
                         if ((resv = DmaBufGetReservationObject(pvr_fence_context->hNativeSync)))
                         {
@@ -1091,7 +1091,7 @@ static unsigned count_reservation_objects(unsigned num_syncs,
 }
 
 static unsigned get_reservation_objects(unsigned num_resvs,
-                                        struct reservation_object **resvs,
+                                        struct dma_resv **resvs,
                                         unsigned num_syncs,
                                         IMG_HANDLE *phSyncInfo,
                                         const IMG_BOOL *pbEnabled)
@@ -1113,7 +1113,7 @@ static unsigned get_reservation_objects(unsigned num_resvs,
                 pvr_fence_context = (struct pvr_fence_context *)psSyncInfo->hFenceContext;
                 if (pvr_fence_context)
                 {
-                        struct reservation_object *resv;
+                        struct dma_resv *resv;
 
                         if ((resv = DmaBufGetReservationObject(pvr_fence_context->hNativeSync)))
                         {
@@ -1127,7 +1127,7 @@ static unsigned get_reservation_objects(unsigned num_resvs,
 }
 
 static void get_all_reservation_objects(unsigned num_resvs,
-                                        struct reservation_object **resvs,
+                                        struct dma_resv **resvs,
                                         IMG_UINT32 ui32NumSrcSyncs,
                                         IMG_HANDLE *phSrcSyncInfo,
                                         const IMG_BOOL *pbSrcEnabled,
@@ -1151,7 +1151,7 @@ static void get_all_reservation_objects(unsigned num_resvs,
 }
 
 static void unlock_reservation_objects(unsigned num_resvs,
-                                        struct reservation_object **resvs)
+                                        struct dma_resv **resvs)
 {
         unsigned i;
 
@@ -1167,8 +1167,8 @@ static void unlock_reservation_objects(unsigned num_resvs,
 static int lock_reservation_objects_no_retry(struct ww_acquire_ctx *ww_acquire_ctx,
                                                 bool interruptible,
                                                 unsigned num_resvs,
-                                                struct reservation_object **resvs,
-                                                struct reservation_object **contended_resv)
+                                                struct dma_resv **resvs,
+                                                struct dma_resv **contended_resv)
 {
         unsigned i;
 
@@ -1220,10 +1220,10 @@ static int lock_reservation_objects_no_retry(struct ww_acquire_ctx *ww_acquire_c
 static int lock_reservation_objects(struct ww_acquire_ctx *ww_acquire_ctx,
                                         bool interruptible,
                                         unsigned num_resvs,
-                                        struct reservation_object **resvs)
+                                        struct dma_resv **resvs)
 {
         int ret;
-        struct reservation_object *contended_resv = NULL;
+        struct dma_resv *contended_resv = NULL;
 
         do {
                 ret = lock_reservation_objects_no_retry(ww_acquire_ctx,
@@ -1444,7 +1444,7 @@ PVRSRV_ERROR PVRLinuxFenceProcess(IMG_UINT32 *pui32Tag,
 {
         u32 tag;
         struct ww_acquire_ctx ww_acquire_ctx;
-        struct reservation_object **resvs = NULL;
+        struct dma_resv **resvs = NULL;
         int ret;
 
         if (!ui32NumResvObjs)
diff --git a/eurasia_km/services4/srvkm/env/linux/pvr_uaccess.h b/eurasia_km/services4/srvkm/env/linux/pvr_uaccess.h
index 3a63836..2191e63 100644
--- a/eurasia_km/services4/srvkm/env/linux/pvr_uaccess.h
+++ b/eurasia_km/services4/srvkm/env/linux/pvr_uaccess.h
@@ -54,7 +54,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 static inline unsigned long pvr_copy_to_user(void __user *pvTo, const void *pvFrom, unsigned long ulBytes)
 {
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
-    if (access_ok(VERIFY_WRITE, pvTo, ulBytes))
+    if (access_ok(pvTo, ulBytes))
     {
         return __copy_to_user(pvTo, pvFrom, ulBytes);
     }
@@ -71,7 +71,7 @@ static inline unsigned long pvr_copy_from_user(void *pvTo, const void __user *pv
      * The compile time correctness checking introduced for copy_from_user in
      * Linux 2.6.33 isn't fully comaptible with our usage of the function.
      */
-    if (access_ok(VERIFY_READ, pvFrom, ulBytes))
+    if (access_ok(pvFrom, ulBytes))
     {
         return __copy_from_user(pvTo, pvFrom, ulBytes);
     }