PERFORCE change 190744 for review

Edward Tomasz Napierala trasz at FreeBSD.org
Fri Apr 1 16:32:47 UTC 2011


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

Change 190744 by trasz at trasz_victim on 2011/03/29 19:38:51

	Fix mismerge.

Affected files ...

.. //depot/projects/soc2009/trasz_limits/sys/sys/jail.h#24 edit

Differences ...

==== //depot/projects/soc2009/trasz_limits/sys/sys/jail.h#24 (text+ko) ====

@@ -182,7 +182,6 @@
 	char		 pr_hostname[MAXHOSTNAMELEN];	/* (p) jail hostname */
 	char		 pr_domainname[MAXHOSTNAMELEN];	/* (p) jail domainname */
 	char		 pr_hostuuid[HOSTUUIDLEN];	/* (p) jail hostuuid */
-	struct racct	 *pr_racct;			/* (c) resource accounting */
 };
 #endif /* _KERNEL || _WANT_PRISON */
 


More information about the p4-projects mailing list