diff --git a/[refs] b/[refs] index ff0df10fce24..421724406245 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6cbe9de7a4353d1a1b77887b5459ac5304c0984a +refs/heads/master: 024f474795af7a0d41bd6d60061d78bd66d13f56 diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index a646e4f36c41..5f889d0cbfcc 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -3378,8 +3378,8 @@ EXPORT_SYMBOL(set_user_nice); */ int can_nice(const task_t *p, const int nice) { - /* convert nice value [19,-20] to rlimit style value [0,39] */ - int nice_rlim = 19 - nice; + /* convert nice value [19,-20] to rlimit style value [1,40] */ + int nice_rlim = 20 - nice; return (nice_rlim <= p->signal->rlim[RLIMIT_NICE].rlim_cur || capable(CAP_SYS_NICE)); }