--- sys/cddl/dev/dtrace/dtrace_ioctl.c.ORIG  2008-02-01 05:40:02.000000000 +0200
+++ sys/cddl/dev/dtrace/dtrace_ioctl.c  2008-02-01 19:37:03.000000000 +0200
@@ -291,7 +291,7 @@
 
                mutex_exit(&dtrace_lock);
 
-               DTRACE_IOCTL_PRINTF("%s(%d): copyout buffer desc: size %zd drops %lu errors %lu\n",__func__,__LINE__,desc.dtbd_size,(u_long) desc.dtbd_drops,(u_long) desc.dtbd_errors);
+               DTRACE_IOCTL_PRINTF("%s(%d): copyout buffer desc: size %llu drops %lu errors %lu\n",__func__,__LINE__,desc.dtbd_size,(u_long) desc.dtbd_drops,(u_long) desc.dtbd_errors);
 
                /*
                 * Finally, copy out the buffer description.
--- sys/cddl/dev/dtrace/i386/dtrace_subr.c.ORIG     2008-01-05 23:57:24.000000000 +0200
+++ sys/cddl/dev/dtrace/i386/dtrace_subr.c      2008-02-02 23:40:25.000000000 +0200
@@ -35,6 +35,7 @@
 #include <sys/kmem.h>
 #include <sys/dtrace_impl.h>
 #include <sys/dtrace_bsd.h>
+#include <machine/frame.h>
 
 extern uintptr_t       kernelbase;
 extern uintptr_t       dtrace_in_probe_addr;
@@ -418,7 +419,7 @@
 
 /* Function to handle DTrace traps during probes. See i386/i386/trap.c */
 int
-dtrace_trap(struct trapframe *frame)
+dtrace_trap(struct trapframe *frame, u_int type)
 {
        /*
         * A trap can occur while DTrace executes a probe. Before