diff -aur -I'$FreeBSD.*[$]' -IJNPR head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c p4/mips2/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c
--- head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c	2008-08-31 15:35:11.000000000 +0000
+++ p4/mips2/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c	2008-09-05 10:58:24.000000000 +0000
@@ -306,7 +306,7 @@
 	case sizeof (double):
 		return (dt_printf(dtp, fp, format,
 		    *((double *)addr) / n));
-#if !defined(__arm__) && !defined(__powerpc__)
+#if !defined(__arm__) && !defined(__powerpc__) && !defined(__mips__)
 	case sizeof (long double):
 		return (dt_printf(dtp, fp, format,
 		    *((long double *)addr) / ldn));
diff -aur -I'$FreeBSD.*[$]' -IJNPR head/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c p4/mips2/src/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c
--- head/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c	2008-08-31 15:40:59.000000000 +0000
+++ p4/mips2/src/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c	2008-08-30 15:11:10.000000000 +0000
@@ -74,7 +74,8 @@
 	return (newval);
 }
 
-#if defined(__sparc64__) || defined(__powerpc__) || defined(__arm__)
+#if defined(__sparc64__) || defined(__powerpc__) || defined(__arm__) || \
+    defined(__mips__)
 void
 atomic_or_8(volatile uint8_t *target, uint8_t value)
 {
diff -aur -I'$FreeBSD.*[$]' -IJNPR head/sys/cddl/compat/opensolaris/sys/atomic.h p4/mips2/src/sys/cddl/compat/opensolaris/sys/atomic.h
--- head/sys/cddl/compat/opensolaris/sys/atomic.h	2008-08-31 15:40:59.000000000 +0000
+++ p4/mips2/src/sys/cddl/compat/opensolaris/sys/atomic.h	2008-08-30 15:11:10.000000000 +0000
@@ -48,7 +48,8 @@
 extern uint8_t atomic_or_8_nv(volatile uint8_t *target, uint8_t value);
 extern void membar_producer(void);
 
-#if defined(__sparc64__) || defined(__powerpc__) || defined(__arm__)
+#if defined(__sparc64__) || defined(__powerpc__) || defined(__arm__) || \
+    defined(__mips__)
 extern void atomic_or_8(volatile uint8_t *target, uint8_t value);
 #else
 static __inline void