[src/trunk]: src/sys/rump/librump/rumpkern Put the syncobjs in emul.c instead...

[pooka <pooka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/deeaa536a524
branches:  trunk
changeset: 327565:deeaa536a524
user:      pooka <pooka%NetBSD.org@localhost>
date:      Tue Mar 11 00:59:38 2014 +0000

description:
Put the syncobjs in emul.c instead of locks.c so that they are
present for both locks.c and locks_up.c alike.

diffstat:

 sys/rump/librump/rumpkern/emul.c  |  7 +++++--
 sys/rump/librump/rumpkern/locks.c |  7 ++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diffs (56 lines):

diff -r e2a78ddb7775 -r deeaa536a524 sys/rump/librump/rumpkern/emul.c
--- a/sys/rump/librump/rumpkern/emul.c  Mon Mar 10 23:02:07 2014 +0000
+++ b/sys/rump/librump/rumpkern/emul.c  Tue Mar 11 00:59:38 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: emul.c,v 1.163 2014/02/20 01:01:10 pooka Exp $ */
+/*     $NetBSD: emul.c,v 1.164 2014/03/11 00:59:38 pooka 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.163 2014/02/20 01:01:10 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: emul.c,v 1.164 2014/03/11 00:59:38 pooka Exp $");
 
 #include <sys/param.h>
 #include <sys/null.h>
@@ -148,6 +148,9 @@
 
 cprng_strong_t *kern_cprng;
 
+/* not used, but need the symbols for pointer comparisons */
+syncobj_t mutex_syncobj, rw_syncobj;
+
 int
 kpause(const char *wmesg, bool intr, int timeo, kmutex_t *mtx)
 {
diff -r e2a78ddb7775 -r deeaa536a524 sys/rump/librump/rumpkern/locks.c
--- a/sys/rump/librump/rumpkern/locks.c Mon Mar 10 23:02:07 2014 +0000
+++ b/sys/rump/librump/rumpkern/locks.c Tue Mar 11 00:59:38 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locks.c,v 1.67 2013/12/09 17:03:41 pooka Exp $ */
+/*     $NetBSD: locks.c,v 1.68 2014/03/11 00:59:38 pooka Exp $ */
 
 /*
  * Copyright (c) 2007-2011 Antti Kantee.  All Rights Reserved.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: locks.c,v 1.67 2013/12/09 17:03:41 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: locks.c,v 1.68 2014/03/11 00:59:38 pooka Exp $");
 
 #include <sys/param.h>
 #include <sys/kmem.h>
@@ -73,9 +73,6 @@
 #define UNLOCKED(a, b)
 #endif
 
-/* not used, but need the symbols for pointer comparisons */
-syncobj_t mutex_syncobj, rw_syncobj;
-
 /*
  * We map locks to pthread routines.  The difference between kernel
  * and rumpuser routines is that while the kernel uses static