---

yaml --- r: 164757 b: refs/heads/master c: cff4edb h: refs/heads/master i: 164755: 3e1577a v: v3
git-mirror · Sep 23, 2009 · 3f7c938 · 3f7c938
1 parent 6b7bb94
commit 3f7c938
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 27f6cb160b71b342b7a47d28a4b6c422ea74ccd1
+refs/heads/master: cff4edb591c153a779a27a3fd8e7bc1217f2f6b8
diff --git a/trunk/fs/proc/base.c b/trunk/fs/proc/base.c
@@ -458,7 +458,7 @@ struct limit_names {
 };
 
 static const struct limit_names lnames[RLIM_NLIMITS] = {
-	[RLIMIT_CPU] = {"Max cpu time", "ms"},
+	[RLIMIT_CPU] = {"Max cpu time", "seconds"},
 	[RLIMIT_FSIZE] = {"Max file size", "bytes"},
 	[RLIMIT_DATA] = {"Max data size", "bytes"},
 	[RLIMIT_STACK] = {"Max stack size", "bytes"},