Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 11 Dec 2006 21:42:22 GMT
From:      Todd Miller <millert@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 111487 for review
Message-ID:  <200612112142.kBBLgMJS097115@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=111487

Change 111487 by millert@millert_g5tower on 2006/12/11 21:41:21

	Undummy mtx_assert; tiger locking provides one.

Affected files ...

.. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_base.c#28 edit
.. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_internal.h#11 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_base.c#28 (text+ko) ====

@@ -322,7 +322,7 @@
 static __inline void
 mac_policy_assert_exclusive(void)
 {
-	mtx_assert(&mac_policy_mtx, MA_OWNED);
+	lck_mtx_assert(mac_policy_mtx, LCK_MTX_ASSERT_OWNED);
 	KASSERT(mac_policy_busy == 0,
 	    ("mac_policy_assert_exclusive(): not exclusive"));
 }

==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_internal.h#11 (text+ko) ====

@@ -381,10 +381,6 @@
 		error = -1;						\
 } while (0)
 
-/* Darwin */
-#define	mtx_assert(x, y)
-#define	MA_OWNED
-
 struct __mac_get_pid_args;
 struct __mac_get_proc_args;
 struct __mac_set_proc_args;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200612112142.kBBLgMJS097115>