Merge branch 'master' of github.com:dtrace4linux/linux

Author: dtrace4linux

driver/cyclic_linux.c

@@ -190,7 +190,11 @@ static void cyclic_tasklet_func(unsigned long arg)
 			break;
 
 		ptr = &cp->c_htp;
-		kt.tv64 = cp->c_time.cyt_interval;
+		#if(LINUX_VERSION_CODE < KERNEL_VERSION(4,10,0))
+			kt.tv64 = cp->c_time.cyt_interval;
+		#else
+			kt = cp->c_time.cyt_interval;
+		#endif
 		/***********************************************/
 		/*   Invoke the callback.		       */
 		/***********************************************/
@@ -326,11 +330,15 @@ cyclic_add(cyc_handler_t *hdrl, cyc_time_t *t)
 	}
 
 	cnt_timer_add++;
-	kt.tv64 = t->cyt_interval;
+	#if(LINUX_VERSION_CODE < KERNEL_VERSION(4,10,0))
+		kt.tv64 = t->cyt_interval;
+	#else
+		kt = t->cyt_interval;
+	#endif
 	cp->c_hdlr = *hdrl;
 	cp->c_time = *t;
-	cp->c_sec = kt.tv64 / (1000 * 1000 * 1000);
-	cp->c_nsec = kt.tv64 % (1000 * 1000 * 1000);
+	cp->c_sec = ktime_to_ns(kt) / (1000 * 1000 * 1000);
+	cp->c_nsec = ktime_to_ns(kt) % (1000 * 1000 * 1000);
 	cp->c_state = TMR_ALIVE;
 
 	fn_hrtimer_init(&cp->c_htp, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
@@ -471,4 +479,3 @@ cyclic_remove(cyclic_id_t id)
 	}
 }
 # endif
-

driver/dtrace_linux.c

@@ -762,7 +762,7 @@ dtrace_linux_init(void)
 	}
 # if defined(__arm__)
 	ktime_get_ptr = (ktime_t (*)(void)) get_proc_addr("ktime_get");
-	# define rdtscll(t) t = ktime_get_ptr().tv64
+	# define rdtscll(t) t = ktime_to_ns(ktime_get_ptr())
 	# define __flush_tlb_all() local_flush_tlb_all()
 	# define _PAGE_NX 0
 	# define _PAGE_RW 0
@@ -3246,4 +3246,3 @@ static void __exit dtracedrv_exit(void)
 }
 module_init(dtracedrv_init);
 module_exit(dtracedrv_exit);
-