From owner-p4-projects@FreeBSD.ORG  Sat Jun  6 17:43:39 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A2C681065670; Sat,  6 Jun 2009 17:43:39 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 62441106564A
	for <perforce@freebsd.org>; Sat,  6 Jun 2009 17:43:39 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 4E6968FC17
	for <perforce@freebsd.org>; Sat,  6 Jun 2009 17:43:39 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n56HhdRC044523
	for <perforce@freebsd.org>; Sat, 6 Jun 2009 17:43:39 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n56Hhdr1044521
	for perforce@freebsd.org; Sat, 6 Jun 2009 17:43:39 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sat, 6 Jun 2009 17:43:39 GMT
Message-Id: <200906061743.n56Hhdr1044521@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>
Cc: 
Subject: PERFORCE change 163658 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Sat, 06 Jun 2009 17:43:40 -0000

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

Change 163658 by rwatson@rwatson_freebsd_capabilities on 2009/06/06 17:42:51

	Fix merge error in map_object.c.

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf/map_object.c#4 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf/map_object.c#4 (text+ko) ====

@@ -153,7 +153,7 @@
     mapsize = base_vlimit - base_vaddr;
     base_addr = hdr->e_type == ET_EXEC ? (caddr_t) base_vaddr : NULL;
 
-    mmap_flags = MAP_ANONY | MAP_PRIVATE | MAP_NOCORE;
+    mmap_flags = MAP_ANON | MAP_PRIVATE | MAP_NOCORE;
     if (base_addr != NULL)
 	mmap_flags |= MAP_FIXED;
     mapbase = mmap(base_addr, mapsize, PROT_NONE, mmap_flags, -1, 0);