Commit 024f4747 authored by Matt Mackall's avatar Matt Mackall Committed by Linus Torvalds

[PATCH] Make RLIMIT_NICE ranges consistent with getpriority(2)

As suggested by Michael Kerrisk <mtk-manpages@gmx.net>, make RLIMIT_NICE
consistent with getpriority before it becomes available in released glibc.
Signed-off-by: default avatarMatt Mackall <mpm@selenic.com>
Acked-by: default avatarIngo Molnar <mingo@elte.hu>
Acked-by: default avatarChris Wright <chrisw@osdl.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 6cbe9de7
...@@ -3378,8 +3378,8 @@ EXPORT_SYMBOL(set_user_nice); ...@@ -3378,8 +3378,8 @@ EXPORT_SYMBOL(set_user_nice);
*/ */
int can_nice(const task_t *p, const int nice) int can_nice(const task_t *p, const int nice)
{ {
/* convert nice value [19,-20] to rlimit style value [0,39] */ /* convert nice value [19,-20] to rlimit style value [1,40] */
int nice_rlim = 19 - nice; int nice_rlim = 20 - nice;
return (nice_rlim <= p->signal->rlim[RLIMIT_NICE].rlim_cur || return (nice_rlim <= p->signal->rlim[RLIMIT_NICE].rlim_cur ||
capable(CAP_SYS_NICE)); capable(CAP_SYS_NICE));
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment