Module Name: src Committed By: yamt Date: Tue Jul 26 12:33:23 UTC 2011
Modified Files: src/external/cddl/osnet/dist/uts/common/dtrace: dtrace.c Log Message: fix a merge botch in rev.1.7 To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 \ src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.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/dist/uts/common/dtrace/dtrace.c diff -u src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c:1.14 src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c:1.15 --- src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c:1.14 Mon Jul 18 02:47:52 2011 +++ src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c Tue Jul 26 12:33:23 2011 @@ -355,7 +355,7 @@ #else (void (*)(void *, dtrace_modctl_t *))dtrace_nullop, #endif - (int (*)(void *, dtrace_id_t, void *))dtrace_nullop, + (int (*)(void *, dtrace_id_t, void *))dtrace_enable_nullop, (void (*)(void *, dtrace_id_t, void *))dtrace_nullop, (void (*)(void *, dtrace_id_t, void *))dtrace_nullop, (void (*)(void *, dtrace_id_t, void *))dtrace_nullop,