build failure (dtrace/lockstat)

[bch <brad.harder%gmail.com@localhost>]

dependall ===> sys/modules/dtrace/sdt
dependall ===> sys/modules/dtrace/fbt
dependall ===> sys/modules/dtrace/lockstat
#   compile  lockstat/lockstat.o
/usr/src/obj/tooldir.NetBSD-7.99.6-amd64/bin/x86_64--netbsd-gcc -O2
-std=gnu99    -Wall -Wstrict-prototypes -Wmissing-prototypes
-Wpointer-arith -Wno-sign-compare  -Wno-traditional
-Wa,--fatal-warnings -Wreturn-type -Wswitch -Wshadow -Wcast-qual
-Wwrite-strings -Wextra -Wno-unused-parameter -Wno-sign-compare
-Werror   -ffreestanding  -fno-strict-aliasing -Wno-pointer-sign
-mno-red-zone -mno-mmx -mno-sse -mno-avx -msoft-float -mcmodel=kernel
-fno-omit-frame-pointer  -I/usr/src/common/include
--sysroot=/usr/src/obj/destdir.amd64
-I/usr/src/external/cddl/osnet/sys
-I/usr/src/external/cddl/osnet/dist/uts/common -DKDTRACE_HOOKS
-nostdinc -I. -I/usr/src/sys/modules/dtrace/lockstat -isystem
/usr/src/sys -isystem /usr/src/sys/arch -isystem
/usr/src/sys/../common/include -D_KERNEL -D_LKM -D_MODULE
-DSYSCTL_INCLUDE_DESCR -c
/usr/src/external/cddl/osnet/dev/lockstat/lockstat.c
/usr/src/external/cddl/osnet/dev/lockstat/lockstat.c: In function
'lockstat_enable':
/usr/src/external/cddl/osnet/dev/lockstat/lockstat.c:207:6: error:
'lockstat_probe_func' undeclared (first use in this function)
  if (lockstat_probe_func == lockstat_probe_stub) {
      ^
/usr/src/external/cddl/osnet/dev/lockstat/lockstat.c:207:6: note: each
undeclared identifier is reported only once for each function it
appears in
/usr/src/external/cddl/osnet/dev/lockstat/lockstat.c:207:29: error:
'lockstat_probe_stub' undeclared (first use in this function)
  if (lockstat_probe_func == lockstat_probe_stub) {
                             ^
/usr/src/external/cddl/osnet/dev/lockstat/lockstat.c:213:2: error:
'lockstat_probemap' undeclared (first use in this function)
  lockstat_probemap[probe->lsp_probe] = id;
  ^
/usr/src/external/cddl/osnet/dev/lockstat/lockstat.c: In function
'lockstat_disable':
/usr/src/external/cddl/osnet/dev/lockstat/lockstat.c:227:2: error:
'lockstat_probemap' undeclared (first use in this function)
  lockstat_probemap[probe->lsp_probe] = 0;
  ^
/usr/src/external/cddl/osnet/dev/lockstat/lockstat.c:233:18: error:
'LS_NPROBES' undeclared (first use in this function)
  for (i = 0; i < LS_NPROBES; i++) {
                  ^
/usr/src/external/cddl/osnet/dev/lockstat/lockstat.c:244:2: error:
'lockstat_probe_func' undeclared (first use in this function)
  lockstat_probe_func = lockstat_probe_stub;
  ^
/usr/src/external/cddl/osnet/dev/lockstat/lockstat.c:244:24: error:
'lockstat_probe_stub' undeclared (first use in this function)
  lockstat_probe_func = lockstat_probe_stub;
                        ^

*** Failed target:  lockstat.o
*** Failed command:
/usr/src/obj/tooldir.NetBSD-7.99.6-amd64/bin/x86_64--netbsd-gcc -O2
-std=gnu99 -Wall -Wstrict-prototypes -Wmissing-prototypes
-Wpointer-arith -Wno-sign-compare -Wno-traditional
-Wa,--fatal-warnings -Wreturn-type -Wswitch -Wshadow -Wcast-qual
-Wwrite-strings -Wextra -Wno-unused-parameter -Wno-sign-compare
-Werror -ffreestanding -fno-strict-aliasing -Wno-pointer-sign
-mno-red-zone -mno-mmx -mno-sse -mno-avx -msoft-float -mcmodel=kernel
-fno-omit-frame-pointer -I/usr/src/common/include
--sysroot=/usr/src/obj/destdir.amd64
-I/usr/src/external/cddl/osnet/sys
-I/usr/src/external/cddl/osnet/dist/uts/common -DKDTRACE_HOOKS
-nostdinc -I. -I/usr/src/sys/modules/dtrace/lockstat -isystem
/usr/src/sys -isystem /usr/src/sys/arch -isystem
/usr/src/sys/../common/include -D_KERNEL -D_LKM -D_MODULE
-DSYSCTL_INCLUDE_DESCR -c
/usr/src/external/cddl/osnet/dev/lockstat/lockstat.c
*** Error code 1