From owner-trustedbsd-cvs@FreeBSD.ORG Mon Dec 11 22:15:31 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A30E016A50B for ; Mon, 11 Dec 2006 22:15:31 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4110143EA1 for ; Mon, 11 Dec 2006 22:05:41 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [69.147.83.53]) by cyrus.watson.org (Postfix) with ESMTP id 5E2CC46D0E for ; Mon, 11 Dec 2006 17:06:25 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [69.147.83.54]) by mx2.freebsd.org (Postfix) with ESMTP id 3EF3B14C154; Mon, 11 Dec 2006 22:03:21 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id C00FB16A59C; Mon, 11 Dec 2006 22:03:20 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9D00C16A58D for ; Mon, 11 Dec 2006 22:03:20 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id AAB9243FFF for ; Mon, 11 Dec 2006 21:41:20 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBBLgRde097131 for ; Mon, 11 Dec 2006 21:42:27 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBBLgMJS097115 for perforce@freebsd.org; Mon, 11 Dec 2006 21:42:22 GMT (envelope-from millert@freebsd.org) Date: Mon, 11 Dec 2006 21:42:22 GMT Message-Id: <200612112142.kBBLgMJS097115@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 111487 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Dec 2006 22:15:31 -0000 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;