PERFORCE change 180035 for review

[Edward Tomasz Napierala]

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

Change 180035 by trasz at 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);
 
 /*