Attachment #589366 for bug #693704

Lines 252-258 Link Here

(-)a/kernel/nv-drm.c (+4 lines)
252	goto done;	252	goto done;
253	}	253	}
254		254
		255	#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0)
255	drm_gem_object_unreference_unlocked(&nv_obj->base);	256	drm_gem_object_unreference_unlocked(&nv_obj->base);
		257	#else
		258	drm_gem_object_put_unlocked(&nv_obj->base);
		259	#endif
256		260
257	status = RM_OK;	261	status = RM_OK;
258		262




#include "os-interface.h"
#include "nv-linux.h"

#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 0, 0)
static inline void do_gettimeofday(struct timeval *tv)
{
    struct timespec64 now;
    ktime_get_real_ts64(&now);
    tv->tv_sec = now.tv_sec;
    tv->tv_usec = now.tv_nsec/1000;
}
#endif

RM_STATUS NV_API_CALL os_disable_console_access(void)
{
    NV_ACQUIRE_CONSOLE_SEM();




#include "nvidia_uvm_lite_counters.h"
#include "ctrl2080mc.h"

#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 0, 0)
static inline void do_gettimeofday(struct timeval *tv)
{
    struct timespec64 now;
    ktime_get_real_ts64(&now);
    tv->tv_sec = now.tv_sec;
    tv->tv_usec = now.tv_nsec/1000;
}
#endif

//
// nvidia_uvm_lite.c
// This file contains code that is specific to the UVM-Lite mode of operation.

Return to bug 693704

Lines 14-19 Link Here

(-)a/kernel/os-interface.c (+10 lines)
14	#include "os-interface.h"	14	#include "os-interface.h"
15	#include "nv-linux.h"	15	#include "nv-linux.h"
16		16
		17	#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 0, 0)
		18	static inline void do_gettimeofday(struct timeval *tv)
		19	{
		20	struct timespec64 now;
		21	ktime_get_real_ts64(&now);
		22	tv->tv_sec = now.tv_sec;
		23	tv->tv_usec = now.tv_nsec/1000;
		24	}
		25	#endif
		26
17	RM_STATUS NV_API_CALL os_disable_console_access(void)	27	RM_STATUS NV_API_CALL os_disable_console_access(void)
18	{	28	{
19	NV_ACQUIRE_CONSOLE_SEM();	29	NV_ACQUIRE_CONSOLE_SEM();

Lines 30-35 Link Here

(-)a/kernel/uvm/nvidia_uvm_lite.c (+10 lines)
30	#include "nvidia_uvm_lite_counters.h"	30	#include "nvidia_uvm_lite_counters.h"
31	#include "ctrl2080mc.h"	31	#include "ctrl2080mc.h"
32		32
		33	#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 0, 0)
		34	static inline void do_gettimeofday(struct timeval *tv)
		35	{
		36	struct timespec64 now;
		37	ktime_get_real_ts64(&now);
		38	tv->tv_sec = now.tv_sec;
		39	tv->tv_usec = now.tv_nsec/1000;
		40	}
		41	#endif
		42
33	//	43	//
34	// nvidia_uvm_lite.c	44	// nvidia_uvm_lite.c
35	// This file contains code that is specific to the UVM-Lite mode of operation.	45	// This file contains code that is specific to the UVM-Lite mode of operation.