svn commit: r225371 - head/sys/kern

[Edward Tomasz Napierala]

Author: trasz
Date: Sun Sep  4 05:04:34 2011
New Revision: 225371
URL: http://svn.freebsd.org/changeset/base/225371

Log:
  Since r224036 the cputime and wallclock are supposed to be in seconds,
  not microseconds.  Make it so.
  
  Approved by:	re (kib)

Modified:
  head/sys/kern/kern_rctl.c

Modified: head/sys/kern/kern_rctl.c
==============================================================================
--- head/sys/kern/kern_rctl.c	Sat Sep  3 21:28:26 2011	(r225370)
+++ head/sys/kern/kern_rctl.c	Sun Sep  4 05:04:34 2011	(r225371)
@@ -908,7 +908,7 @@ rctl_string_to_rule(char *rulestr, struc
 		if (error != 0)
 			goto out;
 		if (RACCT_IS_IN_MILLIONS(rule->rr_resource))
-			rule->rr_amount *= 1000;
+			rule->rr_amount *= 1000000;
 	}
 
 	if (perstr == NULL || perstr[0] == '\0')
@@ -1223,7 +1223,7 @@ rctl_racct_to_sbuf(struct racct *racct, 
 			continue;
 		amount = racct->r_resources[i];
 		if (RACCT_IS_IN_MILLIONS(i))
-			amount /= 1000;
+			amount /= 1000000;
 		sbuf_printf(sb, "%s=%jd,", rctl_resource_name(i), amount);
 	}
 	sbuf_setpos(sb, sbuf_len(sb) - 1);