diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-29 19:01:43 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-29 19:01:43 -0400 |
| commit | da61396d24e37258817e42537c482e962b4742f7 (patch) | |
| tree | 4293a5d557b8f9fed8a2bac93f1e5c939c7b65c3 /kernel/sched.c | |
| parent | 2f058256cb64e346f4fb4499ff4e0f1c2791a4b4 (diff) | |
| parent | 8f3d17fb7bcb7c255197d11469fb5e9695c9d2f4 (diff) | |
Merge upstream kernel into libata 'passthru' branch
Diffstat (limited to 'kernel/sched.c')
| -rw-r--r-- | kernel/sched.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index a646e4f36c41..5f889d0cbfcc 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
| @@ -3378,8 +3378,8 @@ EXPORT_SYMBOL(set_user_nice); | |||
| 3378 | */ | 3378 | */ |
| 3379 | int can_nice(const task_t *p, const int nice) | 3379 | int can_nice(const task_t *p, const int nice) |
| 3380 | { | 3380 | { |
| 3381 | /* convert nice value [19,-20] to rlimit style value [0,39] */ | 3381 | /* convert nice value [19,-20] to rlimit style value [1,40] */ |
| 3382 | int nice_rlim = 19 - nice; | 3382 | int nice_rlim = 20 - nice; |
| 3383 | return (nice_rlim <= p->signal->rlim[RLIMIT_NICE].rlim_cur || | 3383 | return (nice_rlim <= p->signal->rlim[RLIMIT_NICE].rlim_cur || |
| 3384 | capable(CAP_SYS_NICE)); | 3384 | capable(CAP_SYS_NICE)); |
| 3385 | } | 3385 | } |