diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-08-21 00:40:00 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-08-21 00:40:00 -0400 |
| commit | 646352319b6cd369750a706706810d87f6b6efa7 (patch) | |
| tree | e7830e1276cbad7d29bf9471def4b8940592c3b7 /kernel | |
| parent | d3485d37c0b3292aec0618b6663c57542df5da99 (diff) | |
| parent | f6fdd7d9c273bb2a20ab467cb57067494f932fa3 (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/sched.c | 4 | ||||
| -rw-r--r-- | kernel/signal.c | 2 |
2 files changed, 3 insertions, 3 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 | } |
diff --git a/kernel/signal.c b/kernel/signal.c index ca1186eef938..d282fea81138 100644 --- a/kernel/signal.c +++ b/kernel/signal.c | |||
| @@ -692,7 +692,7 @@ static void handle_stop_signal(int sig, struct task_struct *p) | |||
| 692 | { | 692 | { |
| 693 | struct task_struct *t; | 693 | struct task_struct *t; |
| 694 | 694 | ||
| 695 | if (p->flags & SIGNAL_GROUP_EXIT) | 695 | if (p->signal->flags & SIGNAL_GROUP_EXIT) |
| 696 | /* | 696 | /* |
| 697 | * The process is in the middle of dying already. | 697 | * The process is in the middle of dying already. |
| 698 | */ | 698 | */ |