Module Name: src
Committed By: justin
Date: Wed May 28 20:57:23 UTC 2014
Modified Files:
src/sys/rump/librump/rumpkern: emul.c
src/sys/rump/librump/rumpvfs: rumpfs.c
src/sys/rump/net/lib/libshmif: if_shmem.c
Log Message:
Add missing __diagused in rump code
To generate a diff of this commit:
cvs rdiff -u -r1.165 -r1.166 src/sys/rump/librump/rumpkern/emul.c
cvs rdiff -u -r1.127 -r1.128 src/sys/rump/librump/rumpvfs/rumpfs.c
cvs rdiff -u -r1.60 -r1.61 src/sys/rump/net/lib/libshmif/if_shmem.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/librump/rumpkern/emul.c
diff -u src/sys/rump/librump/rumpkern/emul.c:1.165 src/sys/rump/librump/rumpkern/emul.c:1.166
--- src/sys/rump/librump/rumpkern/emul.c:1.165 Fri Apr 25 19:56:01 2014
+++ src/sys/rump/librump/rumpkern/emul.c Wed May 28 20:57:22 2014
@@ -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)
Index: src/sys/rump/librump/rumpvfs/rumpfs.c
diff -u src/sys/rump/librump/rumpvfs/rumpfs.c:1.127 src/sys/rump/librump/rumpvfs/rumpfs.c:1.128
--- src/sys/rump/librump/rumpvfs/rumpfs.c:1.127 Fri Apr 25 13:10:42 2014
+++ src/sys/rump/librump/rumpvfs/rumpfs.c Wed May 28 20:57:22 2014
@@ -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;
Index: src/sys/rump/net/lib/libshmif/if_shmem.c
diff -u src/sys/rump/net/lib/libshmif/if_shmem.c:1.60 src/sys/rump/net/lib/libshmif/if_shmem.c:1.61
--- src/sys/rump/net/lib/libshmif/if_shmem.c:1.60 Thu Mar 20 20:42:08 2014
+++ src/sys/rump/net/lib/libshmif/if_shmem.c Wed May 28 20:57:22 2014
@@ -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
static int
shmif_clone(struct if_clone *ifc, int unit)
{
- int rc;
+ int rc __diagused;
vmem_addr_t unit2;
/*
