Building 7.2 Stable fails to compile dtmalloc

[John B Scroggins]

after cvsuping the latest source files I run into to this during my
build process. Ive rm'd the /usr/../../modules/dtrace directory and
resupped/rebuilt it, but to no avail. as anyone run into this problem?

===> dtrace (all)
===> dtrace/dtmalloc (all)
cc -O2 -fno-strict-aliasing -pipe -march=athlon64  -D_KERNEL
-DKLD_MODULE -std=c99 -nostdinc
-I/usr/src/sys/modules/dtrace/dtmalloc/../../../cddl/compat/opensolaris
-I/usr/src/sys/modules/dtrace/dtmalloc/../../../cddl/contrib/opensolaris/uts/common -I/usr/src/sys/modules/dtrace/dtmalloc/../../.. -DHAVE_KERNEL_OPTION_HEADERS -include /usr/obj/usr/src/sys/rougehunter75/opt_global.h -I. -I@ -I@/contrib/altq -finline-limit=8000 --param inline-unit-growth=100 --param large-function-growth=1000 -fno-common -g -fno-omit-frame-pointer -I/usr/obj/usr/src/sys/rougehunter75 -mcmodel=kernel -mno-red-zone  -mfpmath=387 -mno-sse -mno-sse2 -mno-mmx -mno-3dnow  -msoft-float -fno-asynchronous-unwind-tables -ffreestanding -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes  -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual  -Wundef -Wno-pointer-sign -fformat-extensions -Wno-unknown-pragmas -c /usr/src/sys/modules/dtrace/dtmalloc/../../../cddl/dev/dtmalloc/dtmalloc.c
In file included
from /usr/src/sys/modules/dtrace/dtmalloc/../../../sys/vnode.h:43,

from /usr/src/sys/modules/dtrace/dtmalloc/../../../cddl/contrib/opensolaris/uts/common/sys/vnode.h:44,

from /usr/src/sys/modules/dtrace/dtmalloc/../../../cddl/compat/opensolaris/sys/vnode.h:43,

from /usr/src/sys/modules/dtrace/dtmalloc/../../../cddl/compat/opensolaris/sys/kobj.h:41,

from /usr/src/sys/modules/dtrace/dtmalloc/../../../sys/linker.h:35,

from /usr/src/sys/modules/dtrace/dtmalloc/../../../cddl/compat/opensolaris/sys/modctl.h:34,

from /usr/src/sys/modules/dtrace/dtmalloc/../../../cddl/contrib/opensolaris/uts/common/sys/dtrace.h:50,

from /usr/src/sys/modules/dtrace/dtmalloc/../../../cddl/dev/dtmalloc/dtmalloc.c:35:
/usr/src/sys/modules/dtrace/dtmalloc/../../../cddl/compat/opensolaris/sys/acl.h:35: error: conflicting types for 'aclent_t'
/usr/src/sys/modules/dtrace/dtmalloc/../../../cddl/contrib/opensolaris/uts/common/sys/acl.h:43: error: previous declaration of 'aclent_t' was here
/usr/src/sys/modules/dtrace/dtmalloc/../../../cddl/compat/opensolaris/sys/acl.h:40: error: redefinition of 'struct ace'
/usr/src/sys/modules/dtrace/dtmalloc/../../../cddl/compat/opensolaris/sys/acl.h:45: error: redefinition of typedef 'ace_t'
/usr/src/sys/modules/dtrace/dtmalloc/../../../cddl/contrib/opensolaris/uts/common/sys/acl.h:50: error: previous declaration of 'ace_t' was here
In file included
from /usr/src/sys/modules/dtrace/dtmalloc/../../../sys/vnode.h:43,

from /usr/src/sys/modules/dtrace/dtmalloc/../../../cddl/contrib/opensolaris/uts/common/sys/vnode.h:44,

from /usr/src/sys/modules/dtrace/dtmalloc/../../../cddl/compat/opensolaris/sys/vnode.h:43,

from /usr/src/sys/modules/dtrace/dtmalloc/../../../cddl/compat/opensolaris/sys/kobj.h:41,

from /usr/src/sys/modules/dtrace/dtmalloc/../../../sys/linker.h:35,

from /usr/src/sys/modules/dtrace/dtmalloc/../../../cddl/compat/opensolaris/sys/modctl.h:34,

from /usr/src/sys/modules/dtrace/dtmalloc/../../../cddl/contrib/opensolaris/uts/common/sys/dtrace.h:50,

from /usr/src/sys/modules/dtrace/dtmalloc/../../../cddl/dev/dtmalloc/dtmalloc.c:35:
/usr/src/sys/modules/dtrace/dtmalloc/../../../cddl/compat/opensolaris/sys/acl.h:124:1: warning: "ACE_TYPE_FLAGS" redefined
In file included
from /usr/src/sys/modules/dtrace/dtmalloc/../../../cddl/compat/opensolaris/sys/acl.h:31,

from /usr/src/sys/modules/dtrace/dtmalloc/../../../sys/vnode.h:43,

from /usr/src/sys/modules/dtrace/dtmalloc/../../../cddl/contrib/opensolaris/uts/common/sys/vnode.h:44,

from /usr/src/sys/modules/dtrace/dtmalloc/../../../cddl/compat/opensolaris/sys/vnode.h:43,

from /usr/src/sys/modules/dtrace/dtmalloc/../../../cddl/compat/opensolaris/sys/kobj.h:41,

from /usr/src/sys/modules/dtrace/dtmalloc/../../../sys/linker.h:35,

from /usr/src/sys/modules/dtrace/dtmalloc/../../../cddl/compat/opensolaris/sys/modctl.h:34,

from /usr/src/sys/modules/dtrace/dtmalloc/../../../cddl/contrib/opensolaris/uts/common/sys/dtrace.h:50,

from /usr/src/sys/modules/dtrace/dtmalloc/../../../cddl/dev/dtmalloc/dtmalloc.c:35:
/usr/src/sys/modules/dtrace/dtmalloc/../../../cddl/contrib/opensolaris/uts/common/sys/acl.h:178:1: warning: this is the location of the previous definition
*** Error code 1
1 error
*** Error code 2
1 error
*** Error code 2
1 error
*** Error code 2
1 error
*** Error code 2
1 error
*** Error code 2
1 error

Any pointers would be appreciated. Machine specs are as follows - 
HP 6110us laptop 
FreeBSD is a registered trademark of The FreeBSD Foundation.
FreeBSD 7.2-STABLE #0: Mon May 18 20:17:14 PDT 2009
root at rougehunter75:/usr/obj/usr/src/sys/rougehunter75
Timecounter "i8254" frequency 1193182 Hz quality 0
CPU: AMD Turion(tm) 64 X2 Mobile Technology TL-50 (1607.33-MHz
K8-classCPU)  Origin = "AuthenticAMD"  Id = 0x40f82  Stepping = 2
Features=0x178bfbff<FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CLFLUSH,MMX,FXSR,SSE,SSE2,HTT>
  Features2=0x2001<SSE3,CX16> AMD
Features=0xea500800<SYSCALL,NX,MMX,FFXSR,RDTSCP,LM,3DNow!+,3DNow!>
  AMD Features2=0x1f<LAHF,CMP,SVM,ExtAPIC,CR8>
  Cores per package: 2
usable memory = 1994813440 (1902 MB)
avail memory  = 1922285568 (1833 MB)
ACPI APIC Table: <HP             APIC  >
FreeBSD/SMP: Multiprocessor System Detected: 2 CPUs
cpu0 (BSP): APIC ID:  0
cpu1 (AP): APIC ID:  1