Module Name: src
Committed By: pooka
Date: Tue Mar 11 00:59:38 UTC 2014
Modified Files:
src/sys/rump/librump/rumpkern: emul.c locks.c
Log Message:
Put the syncobjs in emul.c instead of locks.c so that they are
present for both locks.c and locks_up.c alike.
To generate a diff of this commit:
cvs rdiff -u -r1.163 -r1.164 src/sys/rump/librump/rumpkern/emul.c
cvs rdiff -u -r1.67 -r1.68 src/sys/rump/librump/rumpkern/locks.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.163 src/sys/rump/librump/rumpkern/emul.c:1.164
--- src/sys/rump/librump/rumpkern/emul.c:1.163 Thu Feb 20 01:01:10 2014
+++ src/sys/rump/librump/rumpkern/emul.c Tue Mar 11 00:59:38 2014
@@ -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 @@ u_int nprocs = 1;
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)
{
Index: src/sys/rump/librump/rumpkern/locks.c
diff -u src/sys/rump/librump/rumpkern/locks.c:1.67 src/sys/rump/librump/rumpkern/locks.c:1.68
--- src/sys/rump/librump/rumpkern/locks.c:1.67 Mon Dec 9 17:03:41 2013
+++ src/sys/rump/librump/rumpkern/locks.c Tue Mar 11 00:59:38 2014
@@ -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 @@ static lockops_t rw_lockops = {
#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
