diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-03-17 12:01:19 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-03-17 12:01:19 +1100 |
| commit | 23dd64011285010ac291f7dddf6e287bdb43a0ad (patch) | |
| tree | 0e4f4569d38d82f4dceb4150d5ad940e0fd5f24f /mm/mempolicy.c | |
| parent | 516450179454de9e689e0a53ed8f34b896e8651c (diff) | |
| parent | 485ff09990416c75ae9593ddc71619939ab9dd51 (diff) | |
| download | kernel-crypto-23dd64011285010ac291f7dddf6e287bdb43a0ad.tar.gz kernel-crypto-23dd64011285010ac291f7dddf6e287bdb43a0ad.tar.xz kernel-crypto-23dd64011285010ac291f7dddf6e287bdb43a0ad.zip | |
Merge ../linux-2.6
Diffstat (limited to 'mm/mempolicy.c')
| -rw-r--r-- | mm/mempolicy.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mm/mempolicy.c b/mm/mempolicy.c index 954981b1430..2a820600942 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -748,7 +748,7 @@ long do_mbind(unsigned long start, unsigned long len, MPOL_MF_MOVE | MPOL_MF_MOVE_ALL)) || mode > MPOL_MAX) return -EINVAL; - if ((flags & MPOL_MF_MOVE_ALL) && !capable(CAP_SYS_RESOURCE)) + if ((flags & MPOL_MF_MOVE_ALL) && !capable(CAP_SYS_NICE)) return -EPERM; if (start & ~PAGE_MASK) @@ -942,20 +942,20 @@ asmlinkage long sys_migrate_pages(pid_t pid, unsigned long maxnode, */ if ((current->euid != task->suid) && (current->euid != task->uid) && (current->uid != task->suid) && (current->uid != task->uid) && - !capable(CAP_SYS_ADMIN)) { + !capable(CAP_SYS_NICE)) { err = -EPERM; goto out; } task_nodes = cpuset_mems_allowed(task); /* Is the user allowed to access the target nodes? */ - if (!nodes_subset(new, task_nodes) && !capable(CAP_SYS_ADMIN)) { + if (!nodes_subset(new, task_nodes) && !capable(CAP_SYS_NICE)) { err = -EPERM; goto out; } err = do_migrate_pages(mm, &old, &new, - capable(CAP_SYS_ADMIN) ? MPOL_MF_MOVE_ALL : MPOL_MF_MOVE); + capable(CAP_SYS_NICE) ? MPOL_MF_MOVE_ALL : MPOL_MF_MOVE); out: mmput(mm); return err; |