diff options
| author | Steve French <sfrench@us.ibm.com> | 2009-02-03 10:19:23 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2009-02-03 10:19:23 -0500 |
| commit | e1f81c8a417be466e85a38b61679aa6860ec7331 (patch) | |
| tree | 749815f74bfad330e83560a10fd5da5fc4d8c765 /arch/mips/kernel/mips-mt-fpaff.c | |
| parent | 0e2bedaa394f74fa9f75ee937488c33d90039b5a (diff) | |
| parent | b1792e367053968f2ddb48bc911d314143ce6242 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/mips/kernel/mips-mt-fpaff.c')
| -rw-r--r-- | arch/mips/kernel/mips-mt-fpaff.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/mips/kernel/mips-mt-fpaff.c b/arch/mips/kernel/mips-mt-fpaff.c index 5e77a3a21f98..42461310b185 100644 --- a/arch/mips/kernel/mips-mt-fpaff.c +++ b/arch/mips/kernel/mips-mt-fpaff.c | |||
| @@ -79,7 +79,8 @@ asmlinkage long mipsmt_sys_sched_setaffinity(pid_t pid, unsigned int len, | |||
| 79 | 79 | ||
| 80 | euid = current_euid(); | 80 | euid = current_euid(); |
| 81 | retval = -EPERM; | 81 | retval = -EPERM; |
| 82 | if (euid != p->euid && euid != p->uid && !capable(CAP_SYS_NICE)) { | 82 | if (euid != p->cred->euid && euid != p->cred->uid && |
| 83 | !capable(CAP_SYS_NICE)) { | ||
| 83 | read_unlock(&tasklist_lock); | 84 | read_unlock(&tasklist_lock); |
| 84 | goto out_unlock; | 85 | goto out_unlock; |
| 85 | } | 86 | } |