CVS commit: src/external/cddl/osnet

["Chuck Silvers" <chs%netbsd.org@localhost>]

Module Name:    src
Committed By:   chs
Date:           Sat Jun 16 17:31:47 UTC 2012

Modified Files:
        src/external/cddl/osnet/dev/dtrace: dtrace_debug.c
        src/external/cddl/osnet/dev/dtrace/amd64: dtrace_subr.c
        src/external/cddl/osnet/dev/dtrace/i386: dtrace_subr.c
        src/external/cddl/osnet/dev/fbt: fbt.c
        src/external/cddl/osnet/dist/uts/common/dtrace: dtrace.c

Log Message:
reduce diff to freebsd:
rename "xcpu" back to "cpu" now that the conflicting global variable
has been renamed out of the way.  this also fixes some cases
where references to the local variable "cpu" had not been renamed
and thus were accidentally referring to the former global "cpu".


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/cddl/osnet/dev/dtrace/dtrace_debug.c
cvs rdiff -u -r1.6 -r1.7 \
    src/external/cddl/osnet/dev/dtrace/amd64/dtrace_subr.c
cvs rdiff -u -r1.6 -r1.7 \
    src/external/cddl/osnet/dev/dtrace/i386/dtrace_subr.c
cvs rdiff -u -r1.10 -r1.11 src/external/cddl/osnet/dev/fbt/fbt.c
cvs rdiff -u -r1.19 -r1.20 \
    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.