From owner-p4-projects@FreeBSD.ORG  Mon Jun 21 12:44:58 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9EE41106566B; Mon, 21 Jun 2010 12:44:57 +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 613911065674
	for <perforce@freebsd.org>; Mon, 21 Jun 2010 12:44:57 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 4F03A8FC21
	for <perforce@freebsd.org>; Mon, 21 Jun 2010 12:44:57 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o5LCivqP006891
	for <perforce@freebsd.org>; Mon, 21 Jun 2010 12:44:57 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5LCivEb006889
	for perforce@freebsd.org; Mon, 21 Jun 2010 12:44:57 GMT
	(envelope-from trasz@freebsd.org)
Date: Mon, 21 Jun 2010 12:44:57 GMT
Message-Id: <201006211244.o5LCivEb006889@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	trasz@freebsd.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 180035 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Mon, 21 Jun 2010 12:44:58 -0000

http://p4web.freebsd.org/@@180035?ac=10

Change 180035 by trasz@trasz_victim on 2010/06/21 12:44:11

	Fix mismerge.

Affected files ...

.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_resource.c#31 edit

Differences ...

==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_resource.c#31 (text+ko) ====

@@ -83,7 +83,6 @@
 static int	donice(struct thread *td, struct proc *chgp, int n);
 static struct uidinfo *uilookup(uid_t uid);
 static void	ruxagg_locked(struct rusage_ext *rux, struct thread *td);
-static void	ruxagg(struct proc *p, struct thread *td);
 static struct gidinfo *gilookup(gid_t gid);
 
 /*