diff --git a/[refs] b/[refs] index 019a6c494005..d1ac374ad5a0 100644 --- 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 index 55c4c805a756..69bb70351b9b 100644 --- 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"},