Author: markj
Date: Sat Dec 10 03:11:05 2016
New Revision: 309785
URL: https://svnweb.freebsd.org/changeset/base/309785
Log:
Consistently use fbt_excluded() on all architectures.
MFC after: 2 weeks
Modified:
head/sys/cddl/dev/fbt/arm/fbt_isa.c
head/sys/cddl/dev/fbt/powerpc/fbt_isa.c
head/sys/cddl/dev/fbt/x86/fbt_isa.c
Modified: head/sys/cddl/dev/fbt/arm/fbt_isa.c
==============================================================================
--- head/sys/cddl/dev/fbt/arm/fbt_isa.c Sat Dec 10 02:59:34 2016
(r309784)
+++ head/sys/cddl/dev/fbt/arm/fbt_isa.c Sat Dec 10 03:11:05 2016
(r309785)
@@ -95,16 +95,8 @@ fbt_provide_module_function(linker_file_
uint32_t *instr, *limit;
int popm;
- if (strncmp(name, "dtrace_", 7) == 0 &&
- strncmp(name, "dtrace_safe_", 12) != 0) {
- /*
- * Anything beginning with "dtrace_" may be called
- * from probe context unless it explicitly indicates
- * that it won't be called from probe context by
- * using the prefix "dtrace_safe_".
- */
+ if (fbt_excluded(name))
return (0);
- }
instr = (uint32_t *)symval->value;
limit = (uint32_t *)(symval->value + symval->size);
Modified: head/sys/cddl/dev/fbt/powerpc/fbt_isa.c
==============================================================================
--- head/sys/cddl/dev/fbt/powerpc/fbt_isa.c Sat Dec 10 02:59:34 2016
(r309784)
+++ head/sys/cddl/dev/fbt/powerpc/fbt_isa.c Sat Dec 10 03:11:05 2016
(r309785)
@@ -127,16 +127,8 @@ fbt_provide_module_function(linker_file_
return (0);
#endif
- if (strncmp(name, "dtrace_", 7) == 0 &&
- strncmp(name, "dtrace_safe_", 12) != 0) {
- /*
- * Anything beginning with "dtrace_" may be called
- * from probe context unless it explicitly indicates
- * that it won't be called from probe context by
- * using the prefix "dtrace_safe_".
- */
+ if (fbt_excluded(name) == 0)
return (0);
- }
instr = (uint32_t *) symval->value;
limit = (uint32_t *) (symval->value + symval->size);
Modified: head/sys/cddl/dev/fbt/x86/fbt_isa.c
==============================================================================
--- head/sys/cddl/dev/fbt/x86/fbt_isa.c Sat Dec 10 02:59:34 2016
(r309784)
+++ head/sys/cddl/dev/fbt/x86/fbt_isa.c Sat Dec 10 03:11:05 2016
(r309785)
@@ -158,21 +158,15 @@ fbt_provide_module_function(linker_file_
int size;
uint8_t *instr, *limit;
- if ((strncmp(name, "dtrace_", 7) == 0 &&
- strncmp(name, "dtrace_safe_", 12) != 0) ||
- strcmp(name, "trap_check") == 0) {
- /*
- * Anything beginning with "dtrace_" may be called
- * from probe context unless it explicitly indicates
- * that it won't be called from probe context by
- * using the prefix "dtrace_safe_".
- *
- * Additionally, we avoid instrumenting trap_check() to avoid
- * the possibility of generating a fault in probe context before
- * DTrace's fault handler is called.
- */
+ if (fbt_excluded(name))
+ return (0);
+
+ /*
+ * trap_check() is a wrapper for DTrace's fault handler, so we don't
+ * want to be able to instrument it.
+ */
+ if (strcmp(name, "trap_check") == 0)
return (0);
- }
size = symval->size;
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
