diff options
| author | pfg <pfg@FreeBSD.org> | 2013-04-01 19:13:46 +0000 |
|---|---|---|
| committer | pfg <pfg@FreeBSD.org> | 2013-04-01 19:13:46 +0000 |
| commit | 50c97d79d92898d42c89c511f1d7b5971e269fc6 (patch) | |
| tree | 616a766c28f9857c1c230647efb85c7655238976 /sys/modules | |
| parent | 3deb97fc0b145c3f68e924fbc0d4c173749860fd (diff) | |
| parent | 27bdc9a206a2012fbb5f2dfc4ba6e485f4bd1ec9 (diff) | |
| download | FreeBSD-src-50c97d79d92898d42c89c511f1d7b5971e269fc6.zip FreeBSD-src-50c97d79d92898d42c89c511f1d7b5971e269fc6.tar.gz | |
Dtrace: enablings on defunct providers prevent providers from unregistering
Merge change from illumos:
1368 enablings on defunct providers prevent providers from unregistering
We try to address some underlying differences between the Solaris
and FreeBSD implementations: dtrace_attach() / dtrace_detach() are
currently unimplemented in FreeBSD but the new code from illumos
makes use of taskq so some adaptations were made to dtrace_open()
and dtrace_close() to handle them appropriately.
Illumos Revision: r13430:8e6add739e38
Reference:
https://www.illumos.org/issues/1368
Reviewed by: gnn
Tested by: Fabian Keil
Obtained from: Illumos
MFC after: 3 weeks
Diffstat (limited to 'sys/modules')
| -rw-r--r-- | sys/modules/dtrace/dtrace/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sys/modules/dtrace/dtrace/Makefile b/sys/modules/dtrace/dtrace/Makefile index 8312d0c..4f04062 100644 --- a/sys/modules/dtrace/dtrace/Makefile +++ b/sys/modules/dtrace/dtrace/Makefile @@ -3,6 +3,7 @@ ARCHDIR= ${MACHINE_CPUARCH} .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/uts/common/dtrace +.PATH: ${.CURDIR}/../../../cddl/compat/opensolaris/kern .PATH: ${.CURDIR}/../../../cddl/kern .PATH: ${.CURDIR}/../../../cddl/dev/dtrace .PATH: ${.CURDIR}/../../../cddl/dev/dtrace/${ARCHDIR} @@ -26,6 +27,9 @@ SRCS+= assym.s # These are needed for assym.s SRCS+= opt_compat.h opt_kstack_pages.h opt_nfs.h opt_hwpmc_hooks.h +#This is needed for dtrace.c +SRCS += opensolaris_taskq.c + .if ${MACHINE_CPUARCH} == "i386" SRCS+= opt_apic.h .endif |
