Module Name:    src
Committed By:   ozaki-r
Date:           Wed Mar 19 11:14:12 UTC 2014

Modified Files:
        src/external/cddl/osnet/dev/fbt: fbt.c

Log Message:
Exclude mvsoctmr_* functions from FBT targets

Probing them doesn't work for DTrace/arm for some reason.

Anyway with this fix, DTrace/arm works on SHEEVAPLUG
as well as BEAGLEBONE.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/external/cddl/osnet/dev/fbt/fbt.c

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

Modified files:

Index: src/external/cddl/osnet/dev/fbt/fbt.c
diff -u src/external/cddl/osnet/dev/fbt/fbt.c:1.14 src/external/cddl/osnet/dev/fbt/fbt.c:1.15
--- src/external/cddl/osnet/dev/fbt/fbt.c:1.14	Sat Mar 15 08:00:19 2014
+++ src/external/cddl/osnet/dev/fbt/fbt.c	Wed Mar 19 11:14:12 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: fbt.c,v 1.14 2014/03/15 08:00:19 ozaki-r Exp $	*/
+/*	$NetBSD: fbt.c,v 1.15 2014/03/19 11:14:12 ozaki-r Exp $	*/
 
 /*
  * CDDL HEADER START
@@ -756,12 +756,13 @@ fbt_provide_module_cb(const char *name, 
 	    || strncmp(name, "kauth_", 5) == 0 /* CRED XXX for now */
 	    /* Sensitive functions on ARM */
 	    || strncmp(name, "_spl", 4) == 0
-	    || strncmp(name, "dmt_", 4) == 0
 	    || strcmp(name, "binuptime") == 0
 	    || strcmp(name, "dosoftints") == 0
 	    || strcmp(name, "fbt_emulate") == 0
 	    || strcmp(name, "nanouptime") == 0
 	    || strcmp(name, "undefinedinstruction") == 0
+	    || strncmp(name, "dmt_", 4) == 0 /* omap */
+	    || strncmp(name, "mvsoctmr_", 9) == 0 /* marvell */
 	    ) {
 		return 0;
 	}

Reply via email to