diff options
| author | Eric Miao <eric.miao@marvell.com> | 2009-03-09 09:21:07 -0400 |
|---|---|---|
| committer | Eric Miao <eric.miao@marvell.com> | 2009-03-09 09:21:07 -0400 |
| commit | abcea2c322cef559ef2f108b4763d107a5ccc37f (patch) | |
| tree | 5fec7fec372f9bdb70703f6c77bfc49cda945442 /arch/mips/kernel/mips-mt-fpaff.c | |
| parent | 8118aea23c328fd4913b325af53fda9d530b1d56 (diff) | |
| parent | 6d831c6554e4f95083919914955a1a3a4a6acfa9 (diff) | |
Merge branch 'devel' of ssh://master.kernel.org/home/rmk/linux-2.6-arm into devel
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 | } |