Module Name:    src
Committed By:   chs
Date:           Fri Jun  9 01:16:33 UTC 2017

Modified Files:
        src/sys/kern: kern_tc.c

Log Message:
define a copy of getnanotime() named dtrace_getnanotime() so that
dtrace can know from the name that it should not allow setting
fbt probes on it.  needed by dtrace.


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/sys/kern/kern_tc.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/kern/kern_tc.c
diff -u src/sys/kern/kern_tc.c:1.46 src/sys/kern/kern_tc.c:1.47
--- src/sys/kern/kern_tc.c:1.46	Sat Sep 14 20:52:43 2013
+++ src/sys/kern/kern_tc.c	Fri Jun  9 01:16:33 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_tc.c,v 1.46 2013/09/14 20:52:43 martin Exp $ */
+/* $NetBSD: kern_tc.c,v 1.47 2017/06/09 01:16:33 chs Exp $ */
 
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("$FreeBSD: src/sys/kern/kern_tc.c,v 1.166 2005/09/19 22:16:31 andre Exp $"); */
-__KERNEL_RCSID(0, "$NetBSD: kern_tc.c,v 1.46 2013/09/14 20:52:43 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_tc.c,v 1.47 2017/06/09 01:16:33 chs Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ntp.h"
@@ -470,8 +470,8 @@ getbintime(struct bintime *bt)
 	bintime_add(bt, &timebasebin);
 }
 
-void
-getnanotime(struct timespec *tsp)
+static inline void
+dogetnanotime(struct timespec *tsp)
 {
 	struct timehands *th;
 	u_int gen;
@@ -485,6 +485,22 @@ getnanotime(struct timespec *tsp)
 }
 
 void
+getnanotime(struct timespec *tsp)
+{
+
+	dogetnanotime(tsp);
+}
+
+void dtrace_getnanotime(struct timespec *tsp);
+
+void
+dtrace_getnanotime(struct timespec *tsp)
+{
+
+	dogetnanotime(tsp);
+}
+
+void
 getmicrotime(struct timeval *tvp)
 {
 	struct timehands *th;

Reply via email to