[src/trunk]: src/sys/rump/librump/rumpkern Remove last remnants of the long-a...

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

details:   https://anonhg.NetBSD.org/src/rev/8f1fb69949ec
branches:  trunk
changeset: 749586:8f1fb69949ec
user:      pooka <pooka%NetBSD.org@localhost>
date:      Thu Dec 03 13:12:16 2009 +0000

description:
Remove last remnants of the long-ago-properly-fixed RUMP_LMUTEX_MAGIC hack.

diffstat:

 sys/rump/librump/rumpkern/locks.c        |  10 ++++------
 sys/rump/librump/rumpkern/rump_private.h |   4 +---
 2 files changed, 5 insertions(+), 9 deletions(-)

diffs (56 lines):

diff -r 7fbc4ada74cc -r 8f1fb69949ec sys/rump/librump/rumpkern/locks.c
--- a/sys/rump/librump/rumpkern/locks.c Thu Dec 03 12:54:30 2009 +0000
+++ b/sys/rump/librump/rumpkern/locks.c Thu Dec 03 13:12:16 2009 +0000
@@ -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
diff -r 7fbc4ada74cc -r 8f1fb69949ec sys/rump/librump/rumpkern/rump_private.h
--- a/sys/rump/librump/rumpkern/rump_private.h  Thu Dec 03 12:54:30 2009 +0000
+++ b/sys/rump/librump/rumpkern/rump_private.h  Thu Dec 03 13:12:16 2009 +0000
@@ -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;