From owner-p4-projects@FreeBSD.ORG  Wed Nov 10 15:11:39 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C758A16A4D0; Wed, 10 Nov 2004 15:11:38 +0000 (GMT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id A3ED716A4CE
	for <perforce@freebsd.org>; Wed, 10 Nov 2004 15:11:38 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 979EB43D49
	for <perforce@freebsd.org>; Wed, 10 Nov 2004 15:11:38 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iAAFBciA022651
	for <perforce@freebsd.org>; Wed, 10 Nov 2004 15:11:38 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iAAFBcOi022648
	for perforce@freebsd.org; Wed, 10 Nov 2004 15:11:38 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Wed, 10 Nov 2004 15:11:38 GMT
Message-Id: <200411101511.iAAFBcOi022648@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 64823 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Nov 2004 15:11:39 -0000

http://perforce.freebsd.org/chv.cgi?CH=64823

Change 64823 by rwatson@rwatson_tislabs on 2004/11/10 15:11:18

	Correct type merge-o.

Affected files ...

.. //depot/projects/trustedbsd/sebsd/sys/sys/mac.h#19 edit

Differences ...

==== //depot/projects/trustedbsd/sebsd/sys/sys/mac.h#19 (text+ko) ====

@@ -201,7 +201,7 @@
 int	mac_associate_vnode_extattr(struct mount *mp, struct vnode *vp);
 void	mac_associate_vnode_singlelabel(struct mount *mp, struct vnode *vp);
 void	mac_create_devfs_device(struct ucred *cr, struct mount *mp,
-	    struct ucred *dev, struct devfs_dirent *de, const char *fullpath);
+	    struct cdev *dev, struct devfs_dirent *de, const char *fullpath);
 void	mac_create_devfs_directory(struct mount *mp, char *dirname,
 	    int dirnamelen, struct devfs_dirent *de, const char *fullpath);
 void	mac_create_devfs_symlink(struct ucred *cred, struct mount *mp,