Module Name: src
Committed By: pooka
Date: Thu Dec 3 13:12:16 UTC 2009
Modified Files:
src/sys/rump/librump/rumpkern: locks.c rump_private.h
Log Message:
Remove last remnants of the long-ago-properly-fixed RUMP_LMUTEX_MAGIC hack.
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/rump/librump/rumpkern/locks.c
cvs rdiff -u -r1.39 -r1.40 src/sys/rump/librump/rumpkern/rump_private.h
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/locks.c
diff -u src/sys/rump/librump/rumpkern/locks.c:1.36 src/sys/rump/librump/rumpkern/locks.c:1.37
--- src/sys/rump/librump/rumpkern/locks.c:1.36 Tue Dec 1 09:50:51 2009
+++ src/sys/rump/librump/rumpkern/locks.c Thu Dec 3 13:12:16 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: locks.c,v 1.36 2009/12/01 09:50:51 pooka Exp $ */
+/* $NetBSD: locks.c,v 1.37 2009/12/03 13:12:16 pooka Exp $ */
/*
* Copyright (c) 2007, 2008 Antti Kantee. All Rights Reserved.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: locks.c,v 1.36 2009/12/01 09:50:51 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: locks.c,v 1.37 2009/12/03 13:12:16 pooka Exp $");
#include <sys/param.h>
#include <sys/kmem.h>
@@ -81,8 +81,7 @@
mutex_spin_enter(kmutex_t *mtx)
{
- if (__predict_true(mtx != RUMP_LMUTEX_MAGIC))
- mutex_enter(mtx);
+ mutex_enter(mtx);
}
int
@@ -103,8 +102,7 @@
mutex_spin_exit(kmutex_t *mtx)
{
- if (__predict_true(mtx != RUMP_LMUTEX_MAGIC))
- mutex_exit(mtx);
+ mutex_exit(mtx);
}
int
Index: src/sys/rump/librump/rumpkern/rump_private.h
diff -u src/sys/rump/librump/rumpkern/rump_private.h:1.39 src/sys/rump/librump/rumpkern/rump_private.h:1.40
--- src/sys/rump/librump/rumpkern/rump_private.h:1.39 Thu Dec 3 12:35:34 2009
+++ src/sys/rump/librump/rumpkern/rump_private.h Thu Dec 3 13:12:16 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rump_private.h,v 1.39 2009/12/03 12:35:34 pooka Exp $ */
+/* $NetBSD: rump_private.h,v 1.40 2009/12/03 13:12:16 pooka Exp $ */
/*
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
@@ -54,8 +54,6 @@
#define UIO_VMSPACE_SYS (&rump_vmspace)
-#define RUMP_LMUTEX_MAGIC ((kmutex_t *)0x101)
-
extern int rump_threads;
extern struct device rump_rootdev;
