diff --git a/sys/rump/librump/rumpkern/emul.c b/sys/rump/librump/rumpkern/emul.c
index 0f0d41ea479d..a357c85629fa 100644
--- a/sys/rump/librump/rumpkern/emul.c
+++ b/sys/rump/librump/rumpkern/emul.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: emul.c,v 1.165 2014/04/25 19:56:01 pooka Exp $	*/
+/*	$NetBSD: emul.c,v 1.166 2014/05/28 20:57:22 justin Exp $	*/
 
 /*
  * Copyright (c) 2007-2011 Antti Kantee.  All Rights Reserved.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: emul.c,v 1.165 2014/04/25 19:56:01 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: emul.c,v 1.166 2014/05/28 20:57:22 justin Exp $");
 
 #include <sys/param.h>
 #include <sys/null.h>
@@ -157,7 +157,7 @@ int
 kpause(const char *wmesg, bool intr, int timeo, kmutex_t *mtx)
 {
 	extern int hz;
-	int rv;
+	int rv __diagused;
 	uint64_t sec, nsec;
 
 	if (mtx)
diff --git a/sys/rump/librump/rumpvfs/rumpfs.c b/sys/rump/librump/rumpvfs/rumpfs.c
index b102ebffc012..67a987cb60bc 100644
--- a/sys/rump/librump/rumpvfs/rumpfs.c
+++ b/sys/rump/librump/rumpvfs/rumpfs.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rumpfs.c,v 1.127 2014/04/25 13:10:42 pooka Exp $	*/
+/*	$NetBSD: rumpfs.c,v 1.128 2014/05/28 20:57:22 justin Exp $	*/
 
 /*
  * Copyright (c) 2009, 2010, 2011 Antti Kantee.  All Rights Reserved.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rumpfs.c,v 1.127 2014/04/25 13:10:42 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rumpfs.c,v 1.128 2014/05/28 20:57:22 justin Exp $");
 
 #include <sys/param.h>
 #include <sys/atomic.h>
@@ -428,7 +428,7 @@ etfsremove(const char *key)
 {
 	struct etfs *et;
 	size_t keylen;
-	int rv;
+	int rv __diagused;
 
 	if (key[0] != '/') {
 		return EINVAL;
diff --git a/sys/rump/net/lib/libshmif/if_shmem.c b/sys/rump/net/lib/libshmif/if_shmem.c
index 4c58d1d37029..76992050616c 100644
--- a/sys/rump/net/lib/libshmif/if_shmem.c
+++ b/sys/rump/net/lib/libshmif/if_shmem.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_shmem.c,v 1.60 2014/03/20 20:42:08 christos Exp $	*/
+/*	$NetBSD: if_shmem.c,v 1.61 2014/05/28 20:57:22 justin Exp $	*/
 
 /*
  * Copyright (c) 2009, 2010 Antti Kantee.  All Rights Reserved.
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_shmem.c,v 1.60 2014/03/20 20:42:08 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_shmem.c,v 1.61 2014/05/28 20:57:22 justin Exp $");
 
 #include <sys/param.h>
 #include <sys/atomic.h>
@@ -145,7 +145,7 @@ shmif_lockbus(struct shmif_mem *busmem)
 static void
 shmif_unlockbus(struct shmif_mem *busmem)
 {
-	unsigned int old;
+	unsigned int old __diagused;
 
 	membar_exit();
 	old = atomic_swap_32(&busmem->shm_lock, LOCK_UNLOCKED);
@@ -345,7 +345,7 @@ rump_shmif_create(const char *path, int *ifnum)
 static int
 shmif_clone(struct if_clone *ifc, int unit)
 {
-	int rc;
+	int rc __diagused;
 	vmem_addr_t unit2;
 
 	/*